From cae76dd98e301a4560bb46ecb59b5952dff04149 Mon Sep 17 00:00:00 2001 From: Jonathan Bradley Date: Thu, 20 Mar 2025 15:56:35 -0400 Subject: pke: cleanup std stream usage --- src/game.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'src/game.cpp') diff --git a/src/game.cpp b/src/game.cpp index 690292c..3c39018 100644 --- a/src/game.cpp +++ b/src/game.cpp @@ -29,7 +29,6 @@ #include #include #include -#include #include const long readLineLength = 128; @@ -73,7 +72,7 @@ const char *PKE_FILE_CAMERA_INSTANCE_HANDLE = "Cam::InstanceHandle: "; const char *PKE_FILE_CAMERA_TARGET_INSTANCE_HANDLE = "Cam::TargetInstanceHandle: "; const char *PKE_FILE_CAMERA_IS_PRIMARY = "Cam::IsPrimary: "; -void SerializeCamera(std::ostringstream &stream, const PkeCamera &cam) { +void SerializeCamera(std::ostream &stream, const PkeCamera &cam) { NULL_CHAR_ARR(handleStr, 23); PkeCamera c{}; if (cam.type != c.type) { @@ -95,7 +94,7 @@ void SerializeCamera(std::ostringstream &stream, const PkeCamera &cam) { } } -void SerializeInstance(std::ostringstream &stream, const CompInstance &comp) { +void SerializeInstance(std::ostream &stream, const CompInstance &comp) { NULL_CHAR_ARR(handleStr, 23); EntityType *et = nullptr; if (comp.grBindsHandle != GrBindsHandle_MAX) { @@ -163,7 +162,7 @@ bool FindFirstInstanceHandle(void *handle, void *mapping) { InstMapping *inst_mapping = reinterpret_cast(mapping); return inst_mapping->origHandle == *reinterpret_cast(handle); } -void DeserializeCamera(PkeLevel *level, std::ifstream &stream) { +void DeserializeCamera(PkeLevel *level, std::istream &stream) { PkeCamera cam{}; InstanceHandle instanceHandle = InstanceHandle_MAX; InstanceHandle targetInstanceHandle = InstanceHandle_MAX; @@ -248,7 +247,7 @@ void DeserializeCamera(PkeLevel *level, std::ifstream &stream) { } } -void DeserializeInstance(Entity_Base *parentEntity, std::ifstream &stream) { +void DeserializeInstance(Entity_Base *parentEntity, std::istream &stream) { CompInstance comp{}; InstMapping mapping { .origHandle = InstanceHandle_MAX, -- cgit v1.2.3