From 1bdad53998b061044c73ea59bd4e588d21e43aae Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Thu, 21 Aug 2025 20:40:16 +0200 Subject: [PATCH] Update OrcaStream::Chunkstream methods to new code style --- src/openrct2/core/OrcaStream.hpp | 256 ++--- src/openrct2/park/ParkFile.cpp | 1660 +++++++++++++++--------------- 2 files changed, 958 insertions(+), 958 deletions(-) diff --git a/src/openrct2/core/OrcaStream.hpp b/src/openrct2/core/OrcaStream.hpp index 96d3a3ea13..519dccd7ad 100644 --- a/src/openrct2/core/OrcaStream.hpp +++ b/src/openrct2/core/OrcaStream.hpp @@ -267,10 +267,10 @@ namespace OpenRCT2 private: struct ArrayState { - std::streampos StartPos{}; - std::streampos LastPos{}; - size_t Count{}; - size_t ElementSize{}; + std::streampos startPos{}; + std::streampos lastPos{}; + size_t count{}; + size_t elementSize{}; }; MemoryStream& _buffer; @@ -284,33 +284,33 @@ namespace OpenRCT2 { } - Mode GetMode() const + Mode getMode() const { return _mode; } - MemoryStream& GetStream() + MemoryStream& getStream() { return _buffer; } - void ReadWrite(void* addr, const size_t len) + void readWrite(void* addr, const size_t len) { if (_mode == Mode::reading) { - ReadBuffer(addr, len); + readBuffer(addr, len); } else { - WriteBuffer(addr, len); + writeBuffer(addr, len); } } - void Read(void* addr, const size_t len) + void read(void* addr, const size_t len) { if (_mode == Mode::reading) { - ReadBuffer(addr, len); + readBuffer(addr, len); } else { @@ -318,7 +318,7 @@ namespace OpenRCT2 } } - void Write(const void* addr, const size_t len) + void write(const void* addr, const size_t len) { if (_mode == Mode::reading) { @@ -326,195 +326,195 @@ namespace OpenRCT2 } else { - WriteBuffer(addr, len); + writeBuffer(addr, len); } } template::value, bool> = true> - void ReadWrite(T& v) + void readWrite(T& v) { if (_mode == Mode::reading) { - v = ReadInteger(); + v = readInteger(); } else { - WriteInteger(v); + writeInteger(v); } } template::value, bool> = true> - void ReadWrite(T& v) + void readWrite(T& v) { using underlying = typename std::underlying_type::type; if (_mode == Mode::reading) { - v = static_cast(ReadInteger()); + v = static_cast(readInteger()); } else { - WriteInteger(static_cast(v)); + writeInteger(static_cast(v)); } } template - void ReadWrite(TIdentifier& value) + void readWrite(TIdentifier& value) { if (_mode == Mode::reading) { T temp{}; - ReadWrite(temp); + readWrite(temp); value = TIdentifier::FromUnderlying(temp); } else { auto temp = value.ToUnderlying(); - ReadWrite(temp); + readWrite(temp); } } - void ReadWrite(bool& value) + void readWrite(bool& value) { uint8_t value8 = value ? 1 : 0; - ReadWrite(&value8, sizeof(value8)); + readWrite(&value8, sizeof(value8)); value = value8 != 0; } - void ReadWrite(CoordsXY& coords) + void readWrite(CoordsXY& coords) { - ReadWrite(coords.x); - ReadWrite(coords.y); + readWrite(coords.x); + readWrite(coords.y); } - void ReadWrite(CoordsXYZ& coords) + void readWrite(CoordsXYZ& coords) { - ReadWrite(coords.x); - ReadWrite(coords.y); - ReadWrite(coords.z); + readWrite(coords.x); + readWrite(coords.y); + readWrite(coords.z); } - void ReadWrite(CoordsXYZD& coords) + void readWrite(CoordsXYZD& coords) { - ReadWrite(coords.x); - ReadWrite(coords.y); - ReadWrite(coords.z); - ReadWrite(coords.direction); + readWrite(coords.x); + readWrite(coords.y); + readWrite(coords.z); + readWrite(coords.direction); } - void ReadWrite(TileCoordsXY& coords) + void readWrite(TileCoordsXY& coords) { - ReadWrite(coords.x); - ReadWrite(coords.y); + readWrite(coords.x); + readWrite(coords.y); } - void ReadWrite(TileCoordsXYZ& coords) + void readWrite(TileCoordsXYZ& coords) { - ReadWrite(coords.x); - ReadWrite(coords.y); - ReadWrite(coords.z); + readWrite(coords.x); + readWrite(coords.y); + readWrite(coords.z); } - void ReadWrite(TileCoordsXYZD& coords) + void readWrite(TileCoordsXYZD& coords) { - ReadWrite(coords.x); - ReadWrite(coords.y); - ReadWrite(coords.z); - ReadWrite(coords.direction); + readWrite(coords.x); + readWrite(coords.y); + readWrite(coords.z); + readWrite(coords.direction); } template::value>> - T Read() + T read() { T v{}; - ReadWrite(v); + readWrite(v); return v; } - void ReadWrite(std::string& v) + void readWrite(std::string& v) { if (_mode == Mode::reading) { - v = ReadString(); + v = readString(); } else { - WriteString(v); + writeString(v); } } template::value>> - void Write(T v) + void write(T v) { if (_mode == Mode::reading) { T temp{}; - ReadWrite(temp); + readWrite(temp); } else { - ReadWrite(v); + readWrite(v); } } - void Write(const char* v) + void write(const char* v) { std::string_view sv; if (v != nullptr) sv = v; - Write(sv); + write(sv); } - void Write(const std::string_view v) + void write(const std::string_view v) { if (_mode == Mode::reading) { std::string temp; - ReadWrite(temp); + readWrite(temp); } else { - WriteString(v); + writeString(v); } } - void Write(const std::string& v) + void write(const std::string& v) { - Write(std::string_view(v)); + write(std::string_view(v)); } template - void ReadWriteVector(TVec& vec, TFunc f) + void readWriteVector(TVec& vec, TFunc f) { if (_mode == Mode::reading) { - const auto count = BeginArray(); + const auto count = beginArray(); vec.clear(); for (size_t i = 0; i < count; i++) { auto& el = vec.emplace_back(); f(el); - NextArrayElement(); + nextArrayElement(); } - EndArray(); + endArray(); } else { - BeginArray(); + beginArray(); for (auto& el : vec) { f(el); - NextArrayElement(); + nextArrayElement(); } - EndArray(); + endArray(); } } template - void ReadWriteArray(std::span arr, TFunc f) + void readWriteArray(std::span arr, TFunc f) { if (_mode == Mode::reading) { - const auto count = BeginArray(); + const auto count = beginArray(); for (auto& el : arr) { el = {}; @@ -525,69 +525,69 @@ namespace OpenRCT2 { f(arr[i]); } - NextArrayElement(); + nextArrayElement(); } - EndArray(); + endArray(); } else { - BeginArray(); + beginArray(); for (auto& el : arr) { if (f(el)) { - NextArrayElement(); + nextArrayElement(); } } - EndArray(); + endArray(); } } template - void ReadWriteArray(TArr (&arr)[TArrSize], TFunc f) + void readWriteArray(TArr (&arr)[TArrSize], TFunc f) { - ReadWriteArray(std::span{ arr, TArrSize }, f); + readWriteArray(std::span{ arr, TArrSize }, f); } template - void ReadWriteArray(std::array& arr, TFunc f) + void readWriteArray(std::array& arr, TFunc f) { - ReadWriteArray(std::span{ arr.begin(), arr.end() }, f); + readWriteArray(std::span{ arr.begin(), arr.end() }, f); } template - void Ignore() + void ignore() { T value{}; - ReadWrite(value); + readWrite(value); } private: - void ReadBuffer(void* dst, const size_t len) + void readBuffer(void* dst, const size_t len) { _buffer.Read(dst, len); } - void WriteBuffer(const void* buffer, const size_t len) + void writeBuffer(const void* buffer, const size_t len) { _buffer.Write(buffer, len); } template::value>> - T ReadInteger() + T readInteger() { if constexpr (sizeof(T) > 4) { if constexpr (std::is_signed()) { int64_t raw{}; - Read(&raw, sizeof(raw)); + read(&raw, sizeof(raw)); return static_cast(raw); } else { uint64_t raw{}; - Read(&raw, sizeof(raw)); + read(&raw, sizeof(raw)); return static_cast(raw); } } @@ -596,7 +596,7 @@ namespace OpenRCT2 if constexpr (std::is_signed()) { int32_t raw{}; - Read(&raw, sizeof(raw)); + read(&raw, sizeof(raw)); if (raw < std::numeric_limits::min() || raw > std::numeric_limits::max()) { throw std::runtime_error("Value is incompatible with internal type."); @@ -606,7 +606,7 @@ namespace OpenRCT2 else { uint32_t raw{}; - Read(&raw, sizeof(raw)); + read(&raw, sizeof(raw)); if (raw > std::numeric_limits::max()) { throw std::runtime_error("Value is incompatible with internal type."); @@ -617,19 +617,19 @@ namespace OpenRCT2 } template::value>> - void WriteInteger(const T value) + void writeInteger(const T value) { if constexpr (sizeof(T) > 4) { if constexpr (std::is_signed()) { auto raw = static_cast(value); - Write(&raw, sizeof(raw)); + write(&raw, sizeof(raw)); } else { auto raw = static_cast(value); - Write(&raw, sizeof(raw)); + write(&raw, sizeof(raw)); } } else @@ -637,23 +637,23 @@ namespace OpenRCT2 if constexpr (std::is_signed()) { auto raw = static_cast(value); - Write(&raw, sizeof(raw)); + write(&raw, sizeof(raw)); } else { auto raw = static_cast(value); - Write(&raw, sizeof(raw)); + write(&raw, sizeof(raw)); } } } - std::string ReadString() + std::string readString() { std::string buffer; while (true) { char c{}; - ReadBuffer(&c, sizeof(c)); + readBuffer(&c, sizeof(c)); if (c == '\0') { break; @@ -663,7 +663,7 @@ namespace OpenRCT2 return buffer; } - void WriteString(const std::string_view s) + void writeString(const std::string_view s) { const char nullt = '\0'; auto len = s.find('\0'); @@ -675,74 +675,74 @@ namespace OpenRCT2 _buffer.Write(&nullt, sizeof(nullt)); } - size_t BeginArray() + size_t beginArray() { auto& arrayState = _arrayStack.emplace(); if (_mode == Mode::reading) { - arrayState.Count = Read(); - arrayState.ElementSize = Read(); - arrayState.LastPos = _buffer.GetPosition(); - return arrayState.Count; + arrayState.count = read(); + arrayState.elementSize = read(); + arrayState.lastPos = _buffer.GetPosition(); + return arrayState.count; } - arrayState.Count = 0; - arrayState.ElementSize = 0; - arrayState.StartPos = _buffer.GetPosition(); - Write(0); - Write(0); - arrayState.LastPos = _buffer.GetPosition(); + arrayState.count = 0; + arrayState.elementSize = 0; + arrayState.startPos = _buffer.GetPosition(); + write(0); + write(0); + arrayState.lastPos = _buffer.GetPosition(); return 0; } - bool NextArrayElement() + bool nextArrayElement() { auto& arrayState = _arrayStack.top(); if (_mode == Mode::reading) { - if (arrayState.Count == 0) + if (arrayState.count == 0) { return false; } - if (arrayState.ElementSize != 0) + if (arrayState.elementSize != 0) { - arrayState.LastPos += arrayState.ElementSize; - _buffer.SetPosition(arrayState.LastPos); + arrayState.lastPos += arrayState.elementSize; + _buffer.SetPosition(arrayState.lastPos); } - arrayState.Count--; - return arrayState.Count == 0; + arrayState.count--; + return arrayState.count == 0; } - const auto lastElSize = static_cast(_buffer.GetPosition()) - arrayState.LastPos; - if (arrayState.Count == 0) + const auto lastElSize = static_cast(_buffer.GetPosition()) - arrayState.lastPos; + if (arrayState.count == 0) { // Set array element size based on first element size - arrayState.ElementSize = lastElSize; + arrayState.elementSize = lastElSize; } - else if (arrayState.ElementSize != lastElSize) + else if (arrayState.elementSize != lastElSize) { // Array element size was different from first element so reset it // to dynamic - arrayState.ElementSize = 0; + arrayState.elementSize = 0; } - arrayState.Count++; - arrayState.LastPos = _buffer.GetPosition(); + arrayState.count++; + arrayState.lastPos = _buffer.GetPosition(); return true; } - void EndArray() + void endArray() { auto& arrayState = _arrayStack.top(); if (_mode == Mode::writing) { const size_t backupPos = _buffer.GetPosition(); - if (backupPos != static_cast(arrayState.StartPos) + 8 && arrayState.Count == 0) + if (backupPos != static_cast(arrayState.startPos) + 8 && arrayState.count == 0) { throw std::runtime_error("Array data was written but no elements were added."); } - _buffer.SetPosition(arrayState.StartPos); - Write(static_cast(arrayState.Count)); - Write(static_cast(arrayState.ElementSize)); + _buffer.SetPosition(arrayState.startPos); + write(static_cast(arrayState.count)); + write(static_cast(arrayState.elementSize)); _buffer.SetPosition(backupPos); } _arrayStack.pop(); diff --git a/src/openrct2/park/ParkFile.cpp b/src/openrct2/park/ParkFile.cpp index cb1042ae18..81e42b91f7 100644 --- a/src/openrct2/park/ParkFile.cpp +++ b/src/openrct2/park/ParkFile.cpp @@ -218,7 +218,7 @@ namespace OpenRCT2 ScenarioIndexEntry entry{}; auto& os = *_os; os.readWriteChunk(ParkFileChunkType::SCENARIO, [&entry](OrcaStream::ChunkStream& cs) { - entry.Category = cs.Read(); + entry.Category = cs.read(); std::string name; ReadWriteStringTable(cs, name, "en-GB"); @@ -233,10 +233,10 @@ namespace OpenRCT2 entry.Details = scenarioDetails; // wrong order is intentional here due to ReadWriteScenarioChunk writing guests first - entry.ObjectiveType = cs.Read(); - entry.ObjectiveArg1 = cs.Read(); - entry.ObjectiveArg3 = cs.Read(); - entry.ObjectiveArg2 = cs.Read(); + entry.ObjectiveType = cs.read(); + entry.ObjectiveArg1 = cs.read(); + entry.ObjectiveArg3 = cs.read(); + entry.ObjectiveArg2 = cs.read(); entry.SourceGame = ScenarioSource::Other; }); @@ -248,22 +248,22 @@ namespace OpenRCT2 ParkPreview preview{}; auto& os = *_os; os.readWriteChunk(ParkFileChunkType::PREVIEW, [&preview](OrcaStream::ChunkStream& cs) { - cs.ReadWrite(preview.parkName); - cs.ReadWrite(preview.parkRating); - cs.ReadWrite(preview.year); - cs.ReadWrite(preview.month); - cs.ReadWrite(preview.day); - cs.ReadWrite(preview.parkUsesMoney); - cs.ReadWrite(preview.cash); - cs.ReadWrite(preview.numRides); - cs.ReadWrite(preview.numGuests); + cs.readWrite(preview.parkName); + cs.readWrite(preview.parkRating); + cs.readWrite(preview.year); + cs.readWrite(preview.month); + cs.readWrite(preview.day); + cs.readWrite(preview.parkUsesMoney); + cs.readWrite(preview.cash); + cs.readWrite(preview.numRides); + cs.readWrite(preview.numGuests); - cs.ReadWriteVector(preview.images, [&cs](PreviewImage& image) { - cs.ReadWrite(image.type); - cs.ReadWrite(image.width); - cs.ReadWrite(image.height); - cs.ReadWriteArray(image.pixels, [&cs](uint8_t& pixel) { - cs.ReadWrite(pixel); + cs.readWriteVector(preview.images, [&cs](PreviewImage& image) { + cs.readWrite(image.type); + cs.readWrite(image.width); + cs.readWrite(image.height); + cs.readWriteArray(image.pixels, [&cs](uint8_t& pixel) { + cs.readWrite(pixel); return true; }); }); @@ -288,12 +288,12 @@ namespace OpenRCT2 if (os.getMode() == OrcaStream::Mode::writing) { os.readWriteChunk(ParkFileChunkType::AUTHORING, [](OrcaStream::ChunkStream& cs) { - cs.Write(std::string_view(gVersionInfoFull)); + cs.write(std::string_view(gVersionInfoFull)); std::vector authors; - cs.ReadWriteVector(authors, [](std::string& s) {}); - cs.Write(std::string_view()); // custom notes that can be attached to the save - cs.Write(static_cast(std::time(0))); // date started - cs.Write(static_cast(std::time(0))); // date modified + cs.readWriteVector(authors, [](std::string& s) {}); + cs.write(std::string_view()); // custom notes that can be attached to the save + cs.write(static_cast(std::time(0))); // date started + cs.write(static_cast(std::time(0))); // date modified }); } } @@ -323,14 +323,14 @@ namespace OpenRCT2 std::vector legacyPathMappings; os.readWriteChunk( ParkFileChunkType::OBJECTS, [&requiredObjects, version, &legacyPathMappings](OrcaStream::ChunkStream& cs) { - auto numSubLists = cs.Read(); + auto numSubLists = cs.read(); for (size_t i = 0; i < numSubLists; i++) { - auto objectType = static_cast(cs.Read()); - auto subListSize = static_cast(cs.Read()); + auto objectType = static_cast(cs.read()); + auto subListSize = static_cast(cs.read()); for (ObjectEntryIndex j = 0; j < subListSize; j++) { - auto kind = cs.Read(); + auto kind = cs.read(); switch (kind) { @@ -339,7 +339,7 @@ namespace OpenRCT2 case DESCRIPTOR_DAT: { RCTObjectEntry datEntry; - cs.Read(&datEntry, sizeof(datEntry)); + cs.read(&datEntry, sizeof(datEntry)); ObjectEntryDescriptor desc(datEntry); if (version < kFixedObsoleteFootpathsVersion && datEntry.GetType() == ObjectType::paths) { @@ -358,7 +358,7 @@ namespace OpenRCT2 { ObjectEntryDescriptor desc; desc.Type = objectType; - auto identifier = cs.Read(); + auto identifier = cs.read(); if (version <= 7) { auto newIdentifier = MapToNewObjectIdentifier(identifier); @@ -386,7 +386,7 @@ namespace OpenRCT2 } } desc.Identifier = identifier; - desc.Version = VersionTuple(cs.Read()); + desc.Version = VersionTuple(cs.read()); if (version <= 2) { @@ -432,7 +432,7 @@ namespace OpenRCT2 { RCT12::ClimateType legacyClimate{}; os.readWriteChunk(ParkFileChunkType::CLIMATE, [&legacyClimate](OrcaStream::ChunkStream& cs) { - cs.ReadWrite(legacyClimate); + cs.readWrite(legacyClimate); }); auto climateObjId = GetClimateObjectIdFromLegacyClimateType(legacyClimate); @@ -448,32 +448,32 @@ namespace OpenRCT2 auto objectList = objManager.GetLoadedObjects(); // Write number of object sub lists - cs.Write(static_cast(getTransientObjectTypes().size())); + cs.write(static_cast(getTransientObjectTypes().size())); for (auto objectType : getTransientObjectTypes()) { // Write sub list const auto& list = objectList.GetList(objectType); - cs.Write(static_cast(objectType)); - cs.Write(static_cast(list.size())); + cs.write(static_cast(objectType)); + cs.write(static_cast(list.size())); for (const auto& entry : list) { if (entry.HasValue()) { if (entry.Generation == ObjectGeneration::JSON) { - cs.Write(DESCRIPTOR_JSON); - cs.Write(entry.Identifier); - cs.Write(VersionString(entry.Version)); + cs.write(DESCRIPTOR_JSON); + cs.write(entry.Identifier); + cs.write(VersionString(entry.Version)); } else { - cs.Write(DESCRIPTOR_DAT); - cs.Write(&entry.Entry, sizeof(RCTObjectEntry)); + cs.write(DESCRIPTOR_DAT); + cs.write(&entry.Entry, sizeof(RCTObjectEntry)); } } else { - cs.Write(DESCRIPTOR_NONE); + cs.write(DESCRIPTOR_NONE); } } } @@ -484,32 +484,32 @@ namespace OpenRCT2 void ReadWriteScenarioChunk(GameState_t& gameState, OrcaStream& os) { os.readWriteChunk(ParkFileChunkType::SCENARIO, [&gameState, &os](OrcaStream::ChunkStream& cs) { - cs.ReadWrite(gameState.scenarioCategory); + cs.readWrite(gameState.scenarioCategory); ReadWriteStringTable(cs, gameState.scenarioName, "en-GB"); ReadWriteStringTable(cs, gameState.park.Name, "en-GB"); ReadWriteStringTable(cs, gameState.scenarioDetails, "en-GB"); - cs.ReadWrite(gameState.scenarioObjective.Type); - cs.ReadWrite(gameState.scenarioObjective.Year); - cs.ReadWrite(gameState.scenarioObjective.NumGuests); - cs.ReadWrite(gameState.scenarioObjective.Currency); + cs.readWrite(gameState.scenarioObjective.Type); + cs.readWrite(gameState.scenarioObjective.Year); + cs.readWrite(gameState.scenarioObjective.NumGuests); + cs.readWrite(gameState.scenarioObjective.Currency); - cs.ReadWrite(gameState.scenarioParkRatingWarningDays); + cs.readWrite(gameState.scenarioParkRatingWarningDays); - cs.ReadWrite(gameState.scenarioCompletedCompanyValue); + cs.readWrite(gameState.scenarioCompletedCompanyValue); if (gameState.scenarioCompletedCompanyValue == kMoney64Undefined || gameState.scenarioCompletedCompanyValue == kCompanyValueOnFailedObjective) { - cs.Write(""); + cs.write(""); } else { - cs.ReadWrite(gameState.scenarioCompletedBy); + cs.readWrite(gameState.scenarioCompletedBy); } - if (cs.GetMode() == OrcaStream::Mode::reading) + if (cs.getMode() == OrcaStream::Mode::reading) { - auto earlyCompletion = cs.Read(); + auto earlyCompletion = cs.read(); if (NetworkGetMode() == NETWORK_MODE_CLIENT) { gAllowEarlyCompletionInNetworkPlay = earlyCompletion; @@ -517,12 +517,12 @@ namespace OpenRCT2 } else { - cs.Write(AllowEarlyCompletion()); + cs.write(AllowEarlyCompletion()); } if (os.getHeader().targetVersion >= 1) { - cs.ReadWrite(gameState.scenarioFileName); + cs.readWrite(gameState.scenarioFileName); } }); } @@ -532,22 +532,22 @@ namespace OpenRCT2 os.readWriteChunk(ParkFileChunkType::PREVIEW, [&gameState](OrcaStream::ChunkStream& cs) { auto preview = OpenRCT2::generatePreviewFromGameState(gameState); - cs.ReadWrite(preview.parkName); - cs.ReadWrite(preview.parkRating); - cs.ReadWrite(preview.year); - cs.ReadWrite(preview.month); - cs.ReadWrite(preview.day); - cs.ReadWrite(preview.parkUsesMoney); - cs.ReadWrite(preview.cash); - cs.ReadWrite(preview.numRides); - cs.ReadWrite(preview.numGuests); + cs.readWrite(preview.parkName); + cs.readWrite(preview.parkRating); + cs.readWrite(preview.year); + cs.readWrite(preview.month); + cs.readWrite(preview.day); + cs.readWrite(preview.parkUsesMoney); + cs.readWrite(preview.cash); + cs.readWrite(preview.numRides); + cs.readWrite(preview.numGuests); - cs.ReadWriteVector(preview.images, [&cs](PreviewImage& image) { - cs.ReadWrite(image.type); - cs.ReadWrite(image.width); - cs.ReadWrite(image.height); - cs.ReadWriteArray(image.pixels, [&cs](uint8_t& pixel) { - cs.ReadWrite(pixel); + cs.readWriteVector(preview.images, [&cs](PreviewImage& image) { + cs.readWrite(image.type); + cs.readWrite(image.width); + cs.readWrite(image.height); + cs.readWriteArray(image.pixels, [&cs](uint8_t& pixel) { + cs.readWrite(pixel); return true; }); }); @@ -559,91 +559,91 @@ namespace OpenRCT2 const auto version = os.getHeader().targetVersion; auto found = os.readWriteChunk(ParkFileChunkType::GENERAL, [&](OrcaStream::ChunkStream& cs) { // Only GAME_PAUSED_NORMAL from gGamePaused is relevant. - if (cs.GetMode() == OrcaStream::Mode::reading) + if (cs.getMode() == OrcaStream::Mode::reading) { - const uint8_t isPaused = cs.Read(); + const uint8_t isPaused = cs.read(); gGamePaused &= ~GAME_PAUSED_NORMAL; gGamePaused |= (isPaused & GAME_PAUSED_NORMAL); } else { const uint8_t isPaused = (gGamePaused & GAME_PAUSED_NORMAL); - cs.Write(isPaused); + cs.write(isPaused); } - cs.ReadWrite(gameState.currentTicks); - if (cs.GetMode() == OrcaStream::Mode::reading) + cs.readWrite(gameState.currentTicks); + if (cs.getMode() == OrcaStream::Mode::reading) { uint16_t monthTicks; uint32_t monthsElapsed; - cs.ReadWrite(monthTicks); - cs.ReadWrite(monthsElapsed); + cs.readWrite(monthTicks); + cs.readWrite(monthsElapsed); gameState.date = Date{ monthsElapsed, monthTicks }; } else { auto& date = GetDate(); - cs.Write(date.GetMonthTicks()); - cs.Write(date.GetMonthsElapsed()); + cs.write(date.GetMonthTicks()); + cs.write(date.GetMonthsElapsed()); } - if (cs.GetMode() == OrcaStream::Mode::reading) + if (cs.getMode() == OrcaStream::Mode::reading) { uint32_t s0{}, s1{}; - cs.ReadWrite(s0); - cs.ReadWrite(s1); + cs.readWrite(s0); + cs.readWrite(s1); Random::RCT2::Seed s{ s0, s1 }; gameState.scenarioRand.seed(s); } else { auto randState = gameState.scenarioRand.state(); - cs.Write(randState.s0); - cs.Write(randState.s1); + cs.write(randState.s0); + cs.write(randState.s1); } - cs.ReadWrite(gameState.guestInitialHappiness); + cs.readWrite(gameState.guestInitialHappiness); if (version <= 18) { money16 tempGuestInitialCash{}; - cs.ReadWrite(tempGuestInitialCash); + cs.readWrite(tempGuestInitialCash); gameState.guestInitialCash = ToMoney64(tempGuestInitialCash); } else { - cs.ReadWrite(gameState.guestInitialCash); + cs.readWrite(gameState.guestInitialCash); } - cs.ReadWrite(gameState.guestInitialHunger); - cs.ReadWrite(gameState.guestInitialThirst); + cs.readWrite(gameState.guestInitialHunger); + cs.readWrite(gameState.guestInitialThirst); - cs.ReadWrite(gameState.nextGuestNumber); - cs.ReadWriteVector(gameState.peepSpawns, [&cs](PeepSpawn& spawn) { - cs.ReadWrite(spawn.x); - cs.ReadWrite(spawn.y); - cs.ReadWrite(spawn.z); - cs.ReadWrite(spawn.direction); + cs.readWrite(gameState.nextGuestNumber); + cs.readWriteVector(gameState.peepSpawns, [&cs](PeepSpawn& spawn) { + cs.readWrite(spawn.x); + cs.readWrite(spawn.y); + cs.readWrite(spawn.z); + cs.readWrite(spawn.direction); }); if (version <= 18) { money16 tempLandPrice{}; money16 tempConstructionRightPrice{}; - cs.ReadWrite(tempLandPrice); - cs.ReadWrite(tempConstructionRightPrice); + cs.readWrite(tempLandPrice); + cs.readWrite(tempConstructionRightPrice); gameState.landPrice = ToMoney64(tempLandPrice); gameState.constructionRightsPrice = ToMoney64(tempConstructionRightPrice); } else { - cs.ReadWrite(gameState.landPrice); - cs.ReadWrite(gameState.constructionRightsPrice); + cs.readWrite(gameState.landPrice); + cs.readWrite(gameState.constructionRightsPrice); } - cs.ReadWrite(gameState.grassSceneryTileLoopPosition); - cs.ReadWrite(gameState.widePathTileLoopPosition); + cs.readWrite(gameState.grassSceneryTileLoopPosition); + cs.readWrite(gameState.widePathTileLoopPosition); auto& rideRatings = gameState.rideRatingUpdateStates; if (os.getHeader().targetVersion >= 21) { - cs.ReadWriteArray(rideRatings, [this, &cs](OpenRCT2::RideRating::UpdateState& calcData) { + cs.readWriteArray(rideRatings, [this, &cs](OpenRCT2::RideRating::UpdateState& calcData) { ReadWriteRideRatingCalculationData(cs, calcData); return true; }); @@ -662,7 +662,7 @@ namespace OpenRCT2 if (os.getHeader().targetVersion >= 14) { - cs.ReadWrite(gIsAutosave); + cs.readWrite(gIsAutosave); } }); if (!found) @@ -673,47 +673,47 @@ namespace OpenRCT2 void ReadWriteRideRatingCalculationData(OrcaStream::ChunkStream& cs, OpenRCT2::RideRating::UpdateState& calcData) { - cs.ReadWrite(calcData.AmountOfBrakes); - cs.ReadWrite(calcData.Proximity); - cs.ReadWrite(calcData.ProximityStart); - cs.ReadWrite(calcData.CurrentRide); - cs.ReadWrite(calcData.State); - cs.ReadWrite(calcData.ProximityTrackType); - cs.ReadWrite(calcData.ProximityBaseHeight); - cs.ReadWrite(calcData.ProximityTotal); - cs.ReadWriteArray(calcData.ProximityScores, [&cs](uint16_t& value) { - cs.ReadWrite(value); + cs.readWrite(calcData.AmountOfBrakes); + cs.readWrite(calcData.Proximity); + cs.readWrite(calcData.ProximityStart); + cs.readWrite(calcData.CurrentRide); + cs.readWrite(calcData.State); + cs.readWrite(calcData.ProximityTrackType); + cs.readWrite(calcData.ProximityBaseHeight); + cs.readWrite(calcData.ProximityTotal); + cs.readWriteArray(calcData.ProximityScores, [&cs](uint16_t& value) { + cs.readWrite(value); return true; }); - cs.ReadWrite(calcData.AmountOfBrakes); - cs.ReadWrite(calcData.AmountOfReversers); - cs.ReadWrite(calcData.StationFlags); + cs.readWrite(calcData.AmountOfBrakes); + cs.readWrite(calcData.AmountOfReversers); + cs.readWrite(calcData.StationFlags); } void ReadWriteInterfaceChunk(GameState_t& gameState, OrcaStream& os) { os.readWriteChunk(ParkFileChunkType::INTERFACE, [&gameState](OrcaStream::ChunkStream& cs) { - cs.ReadWrite(gameState.savedView.x); - cs.ReadWrite(gameState.savedView.y); - if (cs.GetMode() == OrcaStream::Mode::reading) + cs.readWrite(gameState.savedView.x); + cs.readWrite(gameState.savedView.y); + if (cs.getMode() == OrcaStream::Mode::reading) { - auto savedZoomlevel = static_cast(cs.Read()); + auto savedZoomlevel = static_cast(cs.read()); gameState.savedViewZoom = std::clamp(savedZoomlevel, ZoomLevel::min(), ZoomLevel::max()); } else { - cs.Write(static_cast(gameState.savedViewZoom)); + cs.write(static_cast(gameState.savedViewZoom)); } - cs.ReadWrite(gameState.savedViewRotation); - cs.ReadWrite(gameState.lastEntranceStyle); - cs.ReadWrite(gameState.editorStep); + cs.readWrite(gameState.savedViewRotation); + cs.readWrite(gameState.lastEntranceStyle); + cs.readWrite(gameState.editorStep); }); } void ReadWriteCheatsChunk(GameState_t& gameState, OrcaStream& os) { os.readWriteChunk(ParkFileChunkType::CHEATS, [](OrcaStream::ChunkStream& cs) { - DataSerialiser ds(cs.GetMode() == OrcaStream::Mode::writing, cs.GetStream()); + DataSerialiser ds(cs.getMode() == OrcaStream::Mode::writing, cs.getStream()); CheatsSerialise(ds); }); } @@ -725,16 +725,16 @@ namespace OpenRCT2 // We are want to support all object types in the future, so convert scenery type // to object type when we write the list - cs.ReadWriteVector(restrictedScenery, [&cs](ScenerySelection& item) { - if (cs.GetMode() == OrcaStream::Mode::reading) + cs.readWriteVector(restrictedScenery, [&cs](ScenerySelection& item) { + if (cs.getMode() == OrcaStream::Mode::reading) { - item.SceneryType = GetSceneryTypeFromObjectType(static_cast(cs.Read())); - item.EntryIndex = cs.Read(); + item.SceneryType = GetSceneryTypeFromObjectType(static_cast(cs.read())); + item.EntryIndex = cs.read(); } else { - cs.Write(static_cast(GetObjectTypeFromSceneryType(item.SceneryType))); - cs.Write(item.EntryIndex); + cs.write(static_cast(GetObjectTypeFromSceneryType(item.SceneryType))); + cs.write(item.EntryIndex); } }); }); @@ -757,7 +757,7 @@ namespace OpenRCT2 } os.readWriteChunk(ParkFileChunkType::PLUGIN_STORAGE, [&gameState](OrcaStream::ChunkStream& cs) { - cs.ReadWrite(gameState.pluginStorage); + cs.readWrite(gameState.pluginStorage); }); if (os.getMode() == OrcaStream::Mode::reading) @@ -781,21 +781,21 @@ namespace OpenRCT2 } os.readWriteChunk(ParkFileChunkType::PACKED_OBJECTS, [this](OrcaStream::ChunkStream& cs) { - if (cs.GetMode() == OrcaStream::Mode::reading) + if (cs.getMode() == OrcaStream::Mode::reading) { auto& objRepository = GetContext()->GetObjectRepository(); - auto numObjects = cs.Read(); + auto numObjects = cs.read(); for (uint32_t i = 0; i < numObjects; i++) { - auto type = cs.Read(); + auto type = cs.read(); if (type == DESCRIPTOR_DAT) { RCTObjectEntry entry; - cs.Read(&entry, sizeof(entry)); - auto size = cs.Read(); + cs.read(&entry, sizeof(entry)); + auto size = cs.read(); std::vector data; data.resize(size); - cs.Read(data.data(), data.size()); + cs.read(data.data(), data.size()); auto legacyIdentifier = entry.GetName(); if (objRepository.FindObjectLegacy(legacyIdentifier) == nullptr) @@ -806,11 +806,11 @@ namespace OpenRCT2 } else if (type == DESCRIPTOR_PARKOBJ) { - auto identifier = cs.Read(); - auto size = cs.Read(); + auto identifier = cs.read(); + auto size = cs.read(); std::vector data; data.resize(size); - cs.Read(data.data(), data.size()); + cs.read(data.data(), data.size()); if (objRepository.FindObject(identifier) == nullptr) { objRepository.AddObjectFromFile(ObjectGeneration::JSON, identifier, data.data(), data.size()); @@ -824,12 +824,12 @@ namespace OpenRCT2 } else { - auto& stream = cs.GetStream(); + auto& stream = cs.getStream(); auto countPosition = stream.GetPosition(); // Write placeholder count, update later uint32_t count = 0; - cs.Write(count); + cs.write(count); // Write objects for (const auto* ori : ExportObjectsList) @@ -837,13 +837,13 @@ namespace OpenRCT2 auto extension = Path::GetExtension(ori->Path); if (String::iequals(extension, ".dat")) { - cs.Write(DESCRIPTOR_DAT); - cs.Write(&ori->ObjectEntry, sizeof(RCTObjectEntry)); + cs.write(DESCRIPTOR_DAT); + cs.write(&ori->ObjectEntry, sizeof(RCTObjectEntry)); } else if (String::iequals(extension, ".parkobj")) { - cs.Write(DESCRIPTOR_PARKOBJ); - cs.Write(ori->Identifier); + cs.write(DESCRIPTOR_PARKOBJ); + cs.write(ori->Identifier); } else { @@ -852,14 +852,14 @@ namespace OpenRCT2 } auto data = File::ReadAllBytes(ori->Path); - cs.Write(static_cast(data.size())); - cs.Write(data.data(), data.size()); + cs.write(static_cast(data.size())); + cs.write(data.data(), data.size()); count++; } auto backupPosition = stream.GetPosition(); stream.SetPosition(countPosition); - cs.Write(count); + cs.write(count); stream.SetPosition(backupPosition); } }); @@ -872,18 +872,18 @@ namespace OpenRCT2 if (version < kClimateObjectsVersion) { // Legacy climate is converted elsewhere, so we can skip it here. - cs.Ignore(); + cs.ignore(); } - cs.ReadWrite(gameState.weatherUpdateTimer); + cs.readWrite(gameState.weatherUpdateTimer); for (auto* cl : { &gameState.weatherCurrent, &gameState.weatherNext }) { - cs.ReadWrite(cl->weatherType); - cs.ReadWrite(cl->temperature); - cs.ReadWrite(cl->weatherEffect); - cs.ReadWrite(cl->weatherGloom); - cs.ReadWrite(cl->level); + cs.readWrite(cl->weatherType); + cs.readWrite(cl->temperature); + cs.readWrite(cl->weatherEffect); + cs.readWrite(cl->weatherGloom); + cs.readWrite(cl->level); } }); } @@ -892,38 +892,38 @@ namespace OpenRCT2 { os.readWriteChunk( ParkFileChunkType::PARK, [version = os.getHeader().targetVersion, &gameState](OrcaStream::ChunkStream& cs) { - cs.ReadWrite(gameState.park.Name); - cs.ReadWrite(gameState.park.cash); - cs.ReadWrite(gameState.park.bankLoan); - cs.ReadWrite(gameState.park.maxBankLoan); - cs.ReadWrite(gameState.park.bankLoanInterestRate); - cs.ReadWrite(gameState.park.Flags); + cs.readWrite(gameState.park.Name); + cs.readWrite(gameState.park.cash); + cs.readWrite(gameState.park.bankLoan); + cs.readWrite(gameState.park.maxBankLoan); + cs.readWrite(gameState.park.bankLoanInterestRate); + cs.readWrite(gameState.park.Flags); if (version <= 18) { money16 tempParkEntranceFee{}; - cs.ReadWrite(tempParkEntranceFee); + cs.readWrite(tempParkEntranceFee); gameState.park.EntranceFee = ToMoney64(tempParkEntranceFee); } else { - cs.ReadWrite(gameState.park.EntranceFee); + cs.readWrite(gameState.park.EntranceFee); } - cs.ReadWrite(gameState.park.staffHandymanColour); - cs.ReadWrite(gameState.park.staffMechanicColour); - cs.ReadWrite(gameState.park.staffSecurityColour); - cs.ReadWrite(gameState.park.samePriceThroughoutPark); + cs.readWrite(gameState.park.staffHandymanColour); + cs.readWrite(gameState.park.staffMechanicColour); + cs.readWrite(gameState.park.staffSecurityColour); + cs.readWrite(gameState.park.samePriceThroughoutPark); // Finances - if (cs.GetMode() == OrcaStream::Mode::reading) + if (cs.getMode() == OrcaStream::Mode::reading) { - auto numMonths = std::min(kExpenditureTableMonthCount, cs.Read()); - auto numTypes = std::min(static_cast(ExpenditureType::Count), cs.Read()); + auto numMonths = std::min(kExpenditureTableMonthCount, cs.read()); + auto numTypes = std::min(static_cast(ExpenditureType::Count), cs.read()); for (uint32_t i = 0; i < numMonths; i++) { for (uint32_t j = 0; j < numTypes; j++) { - gameState.park.expenditureTable[i][j] = cs.Read(); + gameState.park.expenditureTable[i][j] = cs.read(); } } } @@ -932,24 +932,24 @@ namespace OpenRCT2 auto numMonths = static_cast(kExpenditureTableMonthCount); auto numTypes = static_cast(ExpenditureType::Count); - cs.Write(numMonths); - cs.Write(numTypes); + cs.write(numMonths); + cs.write(numTypes); for (uint32_t i = 0; i < numMonths; i++) { for (uint32_t j = 0; j < numTypes; j++) { - cs.Write(gameState.park.expenditureTable[i][j]); + cs.write(gameState.park.expenditureTable[i][j]); } } } - cs.ReadWrite(gameState.park.historicalProfit); + cs.readWrite(gameState.park.historicalProfit); // Marketing - cs.ReadWriteVector(gameState.park.marketingCampaigns, [&cs](MarketingCampaign& campaign) { - cs.ReadWrite(campaign.Type); - cs.ReadWrite(campaign.WeeksLeft); - cs.ReadWrite(campaign.flags.holder); - cs.ReadWrite(campaign.RideId); + cs.readWriteVector(gameState.park.marketingCampaigns, [&cs](MarketingCampaign& campaign) { + cs.readWrite(campaign.Type); + cs.readWrite(campaign.WeeksLeft); + cs.readWrite(campaign.flags.holder); + cs.readWrite(campaign.RideId); }); // Awards @@ -957,11 +957,11 @@ namespace OpenRCT2 if (version <= 6) { Award awards[RCT2::Limits::kMaxAwards]{}; - cs.ReadWriteArray(awards, [&cs, ¤tAwards](Award& award) { + cs.readWriteArray(awards, [&cs, ¤tAwards](Award& award) { if (award.Time != 0) { - cs.ReadWrite(award.Time); - cs.ReadWrite(award.Type); + cs.readWrite(award.Time); + cs.readWrite(award.Type); currentAwards.push_back(award); return true; } @@ -971,51 +971,51 @@ namespace OpenRCT2 } else { - cs.ReadWriteVector(currentAwards, [&cs](Award& award) { - cs.ReadWrite(award.Time); - cs.ReadWrite(award.Type); + cs.readWriteVector(currentAwards, [&cs](Award& award) { + cs.readWrite(award.Time); + cs.readWrite(award.Type); }); } - cs.ReadWrite(gameState.park.Value); - cs.ReadWrite(gameState.park.companyValue); - cs.ReadWrite(gameState.park.Size); - cs.ReadWrite(gameState.park.numGuestsInPark); - cs.ReadWrite(gameState.park.numGuestsHeadingForPark); - cs.ReadWrite(gameState.park.Rating); - cs.ReadWrite(gameState.park.RatingCasualtyPenalty); - cs.ReadWrite(gameState.park.currentExpenditure); - cs.ReadWrite(gameState.park.currentProfit); - cs.ReadWrite(gameState.park.weeklyProfitAverageDividend); - cs.ReadWrite(gameState.park.weeklyProfitAverageDivisor); - cs.ReadWrite(gameState.park.totalAdmissions); - cs.ReadWrite(gameState.park.totalIncomeFromAdmissions); + cs.readWrite(gameState.park.Value); + cs.readWrite(gameState.park.companyValue); + cs.readWrite(gameState.park.Size); + cs.readWrite(gameState.park.numGuestsInPark); + cs.readWrite(gameState.park.numGuestsHeadingForPark); + cs.readWrite(gameState.park.Rating); + cs.readWrite(gameState.park.RatingCasualtyPenalty); + cs.readWrite(gameState.park.currentExpenditure); + cs.readWrite(gameState.park.currentProfit); + cs.readWrite(gameState.park.weeklyProfitAverageDividend); + cs.readWrite(gameState.park.weeklyProfitAverageDivisor); + cs.readWrite(gameState.park.totalAdmissions); + cs.readWrite(gameState.park.totalIncomeFromAdmissions); if (version <= 16) { money16 legacyTotalRideValueForMoney = 0; - cs.ReadWrite(legacyTotalRideValueForMoney); + cs.readWrite(legacyTotalRideValueForMoney); gameState.park.totalRideValueForMoney = legacyTotalRideValueForMoney; } else { - cs.ReadWrite(gameState.park.totalRideValueForMoney); + cs.readWrite(gameState.park.totalRideValueForMoney); } - cs.ReadWrite(gameState.park.numGuestsInParkLastWeek); - cs.ReadWrite(gameState.park.guestChangeModifier); - cs.ReadWrite(gameState.park.guestGenerationProbability); - cs.ReadWrite(gameState.park.suggestedGuestMaximum); + cs.readWrite(gameState.park.numGuestsInParkLastWeek); + cs.readWrite(gameState.park.guestChangeModifier); + cs.readWrite(gameState.park.guestGenerationProbability); + cs.readWrite(gameState.park.suggestedGuestMaximum); - cs.ReadWriteArray(gameState.park.peepWarningThrottle, [&cs](uint8_t& value) { - cs.ReadWrite(value); + cs.readWriteArray(gameState.park.peepWarningThrottle, [&cs](uint8_t& value) { + cs.readWrite(value); return true; }); if (version < k16BitParkHistoryVersion) { - if (cs.GetMode() == OrcaStream::Mode::reading) + if (cs.getMode() == OrcaStream::Mode::reading) { uint8_t smallHistory[kParkRatingHistorySize]; - cs.ReadWriteArray(smallHistory, [&cs](uint8_t& value) { - cs.ReadWrite(value); + cs.readWriteArray(smallHistory, [&cs](uint8_t& value) { + cs.readWrite(value); return true; }); for (int i = 0; i < kParkRatingHistorySize; i++) @@ -1042,35 +1042,35 @@ namespace OpenRCT2 gameState.park.RatingHistory[i] / kRCT12ParkRatingHistoryFactor); } } - cs.ReadWriteArray(smallHistory, [&cs](uint8_t& value) { - cs.ReadWrite(value); + cs.readWriteArray(smallHistory, [&cs](uint8_t& value) { + cs.readWrite(value); return true; }); } } else { - cs.ReadWriteArray(gameState.park.RatingHistory, [&cs](uint16_t& value) { - cs.ReadWrite(value); + cs.readWriteArray(gameState.park.RatingHistory, [&cs](uint16_t& value) { + cs.readWrite(value); return true; }); } - cs.ReadWriteArray(gameState.park.guestsInParkHistory, [&cs](uint32_t& value) { - cs.ReadWrite(value); + cs.readWriteArray(gameState.park.guestsInParkHistory, [&cs](uint32_t& value) { + cs.readWrite(value); return true; }); - cs.ReadWriteArray(gameState.park.cashHistory, [&cs](money64& value) { - cs.ReadWrite(value); + cs.readWriteArray(gameState.park.cashHistory, [&cs](money64& value) { + cs.readWrite(value); return true; }); - cs.ReadWriteArray(gameState.park.weeklyProfitHistory, [&cs](money64& value) { - cs.ReadWrite(value); + cs.readWriteArray(gameState.park.weeklyProfitHistory, [&cs](money64& value) { + cs.readWrite(value); return true; }); - cs.ReadWriteArray(gameState.park.ValueHistory, [&cs](money64& value) { - cs.ReadWrite(value); + cs.readWriteArray(gameState.park.ValueHistory, [&cs](money64& value) { + cs.readWrite(value); return true; }); }); @@ -1080,28 +1080,28 @@ namespace OpenRCT2 { os.readWriteChunk(ParkFileChunkType::RESEARCH, [&gameState](OrcaStream::ChunkStream& cs) { // Research status - cs.ReadWrite(gameState.researchFundingLevel); - cs.ReadWrite(gameState.researchPriorities); - cs.ReadWrite(gameState.researchProgressStage); - cs.ReadWrite(gameState.researchProgress); - cs.ReadWrite(gameState.researchExpectedMonth); - cs.ReadWrite(gameState.researchExpectedDay); + cs.readWrite(gameState.researchFundingLevel); + cs.readWrite(gameState.researchPriorities); + cs.readWrite(gameState.researchProgressStage); + cs.readWrite(gameState.researchProgress); + cs.readWrite(gameState.researchExpectedMonth); + cs.readWrite(gameState.researchExpectedDay); ReadWriteResearchItem(cs, gameState.researchLastItem); ReadWriteResearchItem(cs, gameState.researchNextItem); // Invention list - cs.ReadWriteVector( + cs.readWriteVector( gameState.researchItemsUninvented, [&cs](ResearchItem& item) { ReadWriteResearchItem(cs, item); }); - cs.ReadWriteVector( + cs.readWriteVector( gameState.researchItemsInvented, [&cs](ResearchItem& item) { ReadWriteResearchItem(cs, item); }); }); } static void ReadWriteResearchItem(OrcaStream::ChunkStream& cs, std::optional& item) { - if (cs.GetMode() == OrcaStream::Mode::reading) + if (cs.getMode() == OrcaStream::Mode::reading) { - auto hasValue = cs.Read(); + auto hasValue = cs.read(); if (hasValue) { ResearchItem placeholder; @@ -1113,35 +1113,35 @@ namespace OpenRCT2 { if (item) { - cs.Write(true); + cs.write(true); ReadWriteResearchItem(cs, *item); } else { - cs.Write(false); + cs.write(false); } } } static void ReadWriteResearchItem(OrcaStream::ChunkStream& cs, ResearchItem& item) { - cs.ReadWrite(item.type); - cs.ReadWrite(item.baseRideType); - cs.ReadWrite(item.entryIndex); - cs.ReadWrite(item.flags); - cs.ReadWrite(item.category); + cs.readWrite(item.type); + cs.readWrite(item.baseRideType); + cs.readWrite(item.entryIndex); + cs.readWrite(item.flags); + cs.readWrite(item.category); } void ReadWriteNotificationsChunk(GameState_t& gameState, OrcaStream& os) { os.readWriteChunk(ParkFileChunkType::NOTIFICATIONS, [&gameState](OrcaStream::ChunkStream& cs) { - if (cs.GetMode() == OrcaStream::Mode::reading) + if (cs.getMode() == OrcaStream::Mode::reading) { std::vector recent; - cs.ReadWriteVector(recent, [&cs](News::Item& item) { ReadWriteNewsItem(cs, item); }); + cs.readWriteVector(recent, [&cs](News::Item& item) { ReadWriteNewsItem(cs, item); }); std::vector archived; - cs.ReadWriteVector(archived, [&cs](News::Item& item) { ReadWriteNewsItem(cs, item); }); + cs.readWriteVector(archived, [&cs](News::Item& item) { ReadWriteNewsItem(cs, item); }); News::importNewsItems(gameState, recent, archived); } @@ -1149,31 +1149,31 @@ namespace OpenRCT2 { std::vector recent( std::begin(gameState.newsItems.GetRecent()), std::end(gameState.newsItems.GetRecent())); - cs.ReadWriteVector(recent, [&cs](News::Item& item) { ReadWriteNewsItem(cs, item); }); + cs.readWriteVector(recent, [&cs](News::Item& item) { ReadWriteNewsItem(cs, item); }); std::vector archived( std::begin(gameState.newsItems.GetArchived()), std::end(gameState.newsItems.GetArchived())); - cs.ReadWriteVector(archived, [&cs](News::Item& item) { ReadWriteNewsItem(cs, item); }); + cs.readWriteVector(archived, [&cs](News::Item& item) { ReadWriteNewsItem(cs, item); }); } }); } static void ReadWriteNewsItem(OrcaStream::ChunkStream& cs, News::Item& item) { - cs.ReadWrite(item.type); - cs.ReadWrite(item.flags); - cs.ReadWrite(item.assoc); - cs.ReadWrite(item.ticks); - cs.ReadWrite(item.monthYear); - cs.ReadWrite(item.day); - if (cs.GetMode() == OrcaStream::Mode::reading) + cs.readWrite(item.type); + cs.readWrite(item.flags); + cs.readWrite(item.assoc); + cs.readWrite(item.ticks); + cs.readWrite(item.monthYear); + cs.readWrite(item.day); + if (cs.getMode() == OrcaStream::Mode::reading) { - auto s = cs.Read(); + auto s = cs.read(); item.text = s; } else { - cs.Write(std::string_view(item.text)); + cs.write(std::string_view(item.text)); } } @@ -1186,18 +1186,18 @@ namespace OpenRCT2 auto found = os.readWriteChunk( ParkFileChunkType::TILES, [pathToSurfaceMap, pathToQueueSurfaceMap, pathToRailingsMap, &os, &gameState](OrcaStream::ChunkStream& cs) { - cs.ReadWrite(gameState.mapSize.x); - cs.ReadWrite(gameState.mapSize.y); + cs.readWrite(gameState.mapSize.x); + cs.readWrite(gameState.mapSize.y); - if (cs.GetMode() == OrcaStream::Mode::reading) + if (cs.getMode() == OrcaStream::Mode::reading) { gameStateInitAll(gameState, gameState.mapSize); - auto numElements = cs.Read(); + auto numElements = cs.read(); std::vector tileElements; tileElements.resize(numElements); - cs.Read(tileElements.data(), tileElements.size() * sizeof(TileElement)); + cs.read(tileElements.data(), tileElements.size() * sizeof(TileElement)); SetTileElements(gameState, std::move(tileElements)); { TileElementIterator it; @@ -1260,8 +1260,8 @@ namespace OpenRCT2 else { auto tileElements = GetReorganisedTileElementsWithoutGhosts(); - cs.Write(static_cast(tileElements.size())); - cs.Write(tileElements.data(), tileElements.size() * sizeof(TileElement)); + cs.write(static_cast(tileElements.size())); + cs.write(tileElements.data(), tileElements.size() * sizeof(TileElement)); } }); if (!found) @@ -1301,10 +1301,10 @@ namespace OpenRCT2 { os.readWriteChunk(ParkFileChunkType::BANNERS, [&os](OrcaStream::ChunkStream& cs) { auto version = os.getHeader().targetVersion; - if (cs.GetMode() == OrcaStream::Mode::writing) + if (cs.getMode() == OrcaStream::Mode::writing) { auto numBanners = GetNumBanners(); - cs.Write(static_cast(numBanners)); + cs.write(static_cast(numBanners)); [[maybe_unused]] size_t numWritten = 0; for (BannerIndex::UnderlyingType i = 0; i < kMaxBanners; i++) @@ -1319,12 +1319,12 @@ namespace OpenRCT2 assert(numWritten == numBanners); } - else if (cs.GetMode() == OrcaStream::Mode::reading) + else if (cs.getMode() == OrcaStream::Mode::reading) { if (version == 0) { std::vector banners; - cs.ReadWriteVector(banners, [version, &cs](Banner& banner) { ReadWriteBanner(version, cs, banner); }); + cs.readWriteVector(banners, [version, &cs](Banner& banner) { ReadWriteBanner(version, cs, banner); }); for (BannerIndex::UnderlyingType i = 0; i < banners.size(); i++) { auto bannerIndex = BannerIndex::FromUnderlying(i); @@ -1338,7 +1338,7 @@ namespace OpenRCT2 } else { - auto numBanners = cs.Read(); + auto numBanners = cs.read(); for (size_t i = 0; i < numBanners; i++) { Banner readBanner; @@ -1363,16 +1363,16 @@ namespace OpenRCT2 { if (version >= 1) { - cs.ReadWrite(banner.id); + cs.readWrite(banner.id); } - cs.ReadWrite(banner.type); - cs.ReadWrite(banner.flags.holder); - cs.ReadWrite(banner.text); - cs.ReadWrite(banner.colour); - cs.ReadWrite(banner.rideIndex); - cs.ReadWrite(banner.textColour); - cs.ReadWrite(banner.position.x); - cs.ReadWrite(banner.position.y); + cs.readWrite(banner.type); + cs.readWrite(banner.flags.holder); + cs.readWrite(banner.text); + cs.readWrite(banner.colour); + cs.readWrite(banner.rideIndex); + cs.readWrite(banner.textColour); + cs.readWrite(banner.position.x); + cs.readWrite(banner.position.y); } void ReadWriteRidesChunk(GameState_t& gameState, OrcaStream& os) @@ -1380,7 +1380,7 @@ namespace OpenRCT2 const auto version = os.getHeader().targetVersion; os.readWriteChunk(ParkFileChunkType::RIDES, [this, &version, &os](OrcaStream::ChunkStream& cs) { std::vector rideIds; - if (cs.GetMode() == OrcaStream::Mode::reading) + if (cs.getMode() == OrcaStream::Mode::reading) { RideInitAll(); } @@ -1406,34 +1406,34 @@ namespace OpenRCT2 } } } - cs.ReadWriteVector(rideIds, [&cs, &version, &os](RideId& rideId) { + cs.readWriteVector(rideIds, [&cs, &version, &os](RideId& rideId) { // Ride ID - cs.ReadWrite(rideId); + cs.readWrite(rideId); auto& ride = [&]() -> Ride& { - if (cs.GetMode() == OrcaStream::Mode::writing) + if (cs.getMode() == OrcaStream::Mode::writing) return *GetRide(rideId); else return *RideAllocateAtIndex(rideId); }(); // Status - cs.ReadWrite(ride.type); - cs.ReadWrite(ride.subtype); - cs.ReadWrite(ride.mode); - cs.ReadWrite(ride.status); - cs.ReadWrite(ride.departFlags); - cs.ReadWrite(ride.lifecycleFlags); + cs.readWrite(ride.type); + cs.readWrite(ride.subtype); + cs.readWrite(ride.mode); + cs.readWrite(ride.status); + cs.readWrite(ride.departFlags); + cs.readWrite(ride.lifecycleFlags); // Meta - cs.ReadWrite(ride.customName); - cs.ReadWrite(ride.defaultNameNumber); + cs.readWrite(ride.customName); + cs.readWrite(ride.defaultNameNumber); if (version <= 18) { money16 prices[2] = {}; - cs.ReadWriteArray(prices, [&cs](money16& price) { - cs.ReadWrite(price); + cs.readWriteArray(prices, [&cs](money16& price) { + cs.readWrite(price); return true; }); ride.price[0] = prices[0]; @@ -1441,99 +1441,99 @@ namespace OpenRCT2 } else { - cs.ReadWriteArray(ride.price, [&cs](money64& price) { - cs.ReadWrite(price); + cs.readWriteArray(ride.price, [&cs](money64& price) { + cs.readWrite(price); return true; }); } // Colours - cs.ReadWrite(ride.entranceStyle); - cs.ReadWrite(ride.vehicleColourSettings); - cs.ReadWriteArray(ride.trackColours, [&cs](TrackColour& tc) { - cs.ReadWrite(tc.main); - cs.ReadWrite(tc.additional); - cs.ReadWrite(tc.supports); + cs.readWrite(ride.entranceStyle); + cs.readWrite(ride.vehicleColourSettings); + cs.readWriteArray(ride.trackColours, [&cs](TrackColour& tc) { + cs.readWrite(tc.main); + cs.readWrite(tc.additional); + cs.readWrite(tc.supports); return true; }); - cs.ReadWriteArray(ride.vehicleColours, [&cs](VehicleColour& vc) { - cs.ReadWrite(vc.Body); - cs.ReadWrite(vc.Trim); - cs.ReadWrite(vc.Tertiary); + cs.readWriteArray(ride.vehicleColours, [&cs](VehicleColour& vc) { + cs.readWrite(vc.Body); + cs.readWrite(vc.Trim); + cs.readWrite(vc.Tertiary); return true; }); // Stations - cs.ReadWrite(ride.numStations); - cs.ReadWriteArray(ride.getStations(), [&cs](RideStation& station) { - cs.ReadWrite(station.Start); - cs.ReadWrite(station.Height); - cs.ReadWrite(station.Length); - cs.ReadWrite(station.Depart); - cs.ReadWrite(station.TrainAtStation); - cs.ReadWrite(station.Entrance); - cs.ReadWrite(station.Exit); - cs.ReadWrite(station.SegmentLength); - cs.ReadWrite(station.SegmentTime); - cs.ReadWrite(station.QueueTime); - cs.ReadWrite(station.QueueLength); - cs.ReadWrite(station.LastPeepInQueue); + cs.readWrite(ride.numStations); + cs.readWriteArray(ride.getStations(), [&cs](RideStation& station) { + cs.readWrite(station.Start); + cs.readWrite(station.Height); + cs.readWrite(station.Length); + cs.readWrite(station.Depart); + cs.readWrite(station.TrainAtStation); + cs.readWrite(station.Entrance); + cs.readWrite(station.Exit); + cs.readWrite(station.SegmentLength); + cs.readWrite(station.SegmentTime); + cs.readWrite(station.QueueTime); + cs.readWrite(station.QueueLength); + cs.readWrite(station.LastPeepInQueue); return true; }); - cs.ReadWrite(ride.overallView.x); - cs.ReadWrite(ride.overallView.y); + cs.readWrite(ride.overallView.x); + cs.readWrite(ride.overallView.y); // Vehicles - cs.ReadWrite(ride.numTrains); - cs.ReadWrite(ride.numCarsPerTrain); - cs.ReadWrite(ride.proposedNumTrains); - cs.ReadWrite(ride.proposedNumCarsPerTrain); - cs.ReadWrite(ride.maxTrains); + cs.readWrite(ride.numTrains); + cs.readWrite(ride.numCarsPerTrain); + cs.readWrite(ride.proposedNumTrains); + cs.readWrite(ride.proposedNumCarsPerTrain); + cs.readWrite(ride.maxTrains); if (version < 0x5) { uint8_t value; - cs.ReadWrite(value); + cs.readWrite(value); ride.minCarsPerTrain = GetMinCarsPerTrain(value); ride.maxCarsPerTrain = GetMaxCarsPerTrain(value); } else { - cs.ReadWrite(ride.minCarsPerTrain); - cs.ReadWrite(ride.maxCarsPerTrain); + cs.readWrite(ride.minCarsPerTrain); + cs.readWrite(ride.maxCarsPerTrain); } - cs.ReadWrite(ride.minWaitingTime); - cs.ReadWrite(ride.maxWaitingTime); - cs.ReadWriteArray(ride.vehicles, [&cs](EntityId& v) { - cs.ReadWrite(v); + cs.readWrite(ride.minWaitingTime); + cs.readWrite(ride.maxWaitingTime); + cs.readWriteArray(ride.vehicles, [&cs](EntityId& v) { + cs.readWrite(v); return true; }); // Operation - cs.ReadWrite(ride.operationOption); - cs.ReadWrite(ride.liftHillSpeed); - cs.ReadWrite(ride.numCircuits); + cs.readWrite(ride.operationOption); + cs.readWrite(ride.liftHillSpeed); + cs.readWrite(ride.numCircuits); // Special - cs.ReadWrite(ride.boatHireReturnDirection); - cs.ReadWrite(ride.boatHireReturnPosition); - cs.ReadWrite(ride.chairliftBullwheelLocation[0]); - cs.ReadWrite(ride.chairliftBullwheelLocation[1]); - cs.ReadWrite(ride.chairliftBullwheelRotation); - cs.ReadWrite(ride.slideInUse); - cs.ReadWrite(ride.slidePeep); - cs.ReadWrite(ride.slidePeepTShirtColour); - cs.ReadWrite(ride.spiralSlideProgress); - cs.ReadWrite(ride.raceWinner); - cs.ReadWrite(ride.cableLift); - cs.ReadWrite(ride.cableLiftLoc); + cs.readWrite(ride.boatHireReturnDirection); + cs.readWrite(ride.boatHireReturnPosition); + cs.readWrite(ride.chairliftBullwheelLocation[0]); + cs.readWrite(ride.chairliftBullwheelLocation[1]); + cs.readWrite(ride.chairliftBullwheelRotation); + cs.readWrite(ride.slideInUse); + cs.readWrite(ride.slidePeep); + cs.readWrite(ride.slidePeepTShirtColour); + cs.readWrite(ride.spiralSlideProgress); + cs.readWrite(ride.raceWinner); + cs.readWrite(ride.cableLift); + cs.readWrite(ride.cableLiftLoc); // Stats - if (cs.GetMode() == OrcaStream::Mode::reading) + if (cs.getMode() == OrcaStream::Mode::reading) { - auto hasMeasurement = cs.Read(); + auto hasMeasurement = cs.read(); if (hasMeasurement != 0) { ride.measurement = std::make_unique(); @@ -1544,91 +1544,91 @@ namespace OpenRCT2 { if (ride.measurement == nullptr) { - cs.Write(0); + cs.write(0); } else { - cs.Write(1); + cs.write(1); ReadWriteRideMeasurement(cs, *ride.measurement); } } if (os.getHeader().targetVersion < kHigherInversionsHolesHelicesStatsVersion) { - uint8_t combinedValue = cs.Read(); + uint8_t combinedValue = cs.read(); auto split = splitCombinedHelicesAndSpecialElements(combinedValue); ride.numHelices = split.first; ride.specialTrackElements = split.second; } else { - cs.ReadWrite(ride.numHelices); - cs.ReadWrite(ride.specialTrackElements.holder); + cs.readWrite(ride.numHelices); + cs.readWrite(ride.specialTrackElements.holder); } - cs.ReadWrite(ride.maxSpeed); - cs.ReadWrite(ride.averageSpeed); - cs.ReadWrite(ride.currentTestSegment); - cs.ReadWrite(ride.averageSpeedTestTimeout); + cs.readWrite(ride.maxSpeed); + cs.readWrite(ride.averageSpeed); + cs.readWrite(ride.currentTestSegment); + cs.readWrite(ride.averageSpeedTestTimeout); - cs.ReadWrite(ride.maxPositiveVerticalG); - cs.ReadWrite(ride.maxNegativeVerticalG); - cs.ReadWrite(ride.maxLateralG); - cs.ReadWrite(ride.previousVerticalG); - cs.ReadWrite(ride.previousLateralG); + cs.readWrite(ride.maxPositiveVerticalG); + cs.readWrite(ride.maxNegativeVerticalG); + cs.readWrite(ride.maxLateralG); + cs.readWrite(ride.previousVerticalG); + cs.readWrite(ride.previousLateralG); - cs.ReadWrite(ride.testingFlags.holder); - cs.ReadWrite(ride.curTestTrackLocation); + cs.readWrite(ride.testingFlags.holder); + cs.readWrite(ride.curTestTrackLocation); - cs.ReadWrite(ride.turnCountDefault); - cs.ReadWrite(ride.turnCountBanked); - cs.ReadWrite(ride.turnCountSloped); + cs.readWrite(ride.turnCountDefault); + cs.readWrite(ride.turnCountBanked); + cs.readWrite(ride.turnCountSloped); if (version < kHigherInversionsHolesHelicesStatsVersion) { - uint16_t numInversions = cs.Read(); + uint16_t numInversions = cs.read(); ride.numInversions = numInversions; - auto combinedValue = cs.Read(); + auto combinedValue = cs.read(); auto split = splitCombinedNumDropsPoweredLifts(combinedValue); ride.numDrops = split.first; ride.numPoweredLifts = split.second; } else { - cs.ReadWrite(ride.numInversions); - cs.ReadWrite(ride.numDrops); - cs.ReadWrite(ride.numPoweredLifts); + cs.readWrite(ride.numInversions); + cs.readWrite(ride.numDrops); + cs.readWrite(ride.numPoweredLifts); } - cs.ReadWrite(ride.startDropHeight); - cs.ReadWrite(ride.highestDropHeight); - cs.ReadWrite(ride.shelteredLength); - cs.ReadWrite(ride.var11C); - cs.ReadWrite(ride.numShelteredSections); + cs.readWrite(ride.startDropHeight); + cs.readWrite(ride.highestDropHeight); + cs.readWrite(ride.shelteredLength); + cs.readWrite(ride.var11C); + cs.readWrite(ride.numShelteredSections); if (version >= kInversionsHolesShelteredEightsSplit) { - cs.ReadWrite(ride.shelteredEighths); + cs.readWrite(ride.shelteredEighths); if (version < kHigherInversionsHolesHelicesStatsVersion) { - auto numHoles = cs.Read(); + auto numHoles = cs.read(); ride.numHoles = numHoles; } else { - cs.ReadWrite(ride.numHoles); + cs.readWrite(ride.numHoles); } } - cs.ReadWrite(ride.currentTestStation); - cs.ReadWrite(ride.numBlockBrakes); - cs.ReadWrite(ride.totalAirTime); + cs.readWrite(ride.currentTestStation); + cs.readWrite(ride.numBlockBrakes); + cs.readWrite(ride.totalAirTime); - cs.ReadWrite(ride.ratings.excitement); - cs.ReadWrite(ride.ratings.intensity); - cs.ReadWrite(ride.ratings.nausea); + cs.readWrite(ride.ratings.excitement); + cs.readWrite(ride.ratings.intensity); + cs.readWrite(ride.ratings.nausea); if (version <= 18) { uint16_t tempRideValue{}; - cs.ReadWrite(tempRideValue); + cs.readWrite(tempRideValue); if (tempRideValue == 0xFFFFu) { ride.value = kRideValueUndefined; @@ -1641,7 +1641,7 @@ namespace OpenRCT2 else if (version == 19) { money64 tempRideValue{}; - cs.ReadWrite(tempRideValue); + cs.readWrite(tempRideValue); if (tempRideValue == 0xFFFFu) { ride.value = kRideValueUndefined; @@ -1653,79 +1653,79 @@ namespace OpenRCT2 } else { - cs.ReadWrite(ride.value); + cs.readWrite(ride.value); } - cs.ReadWrite(ride.numRiders); - cs.ReadWrite(ride.buildDate); + cs.readWrite(ride.numRiders); + cs.readWrite(ride.buildDate); if (version <= 18) { money16 tempUpkeepCost{}; - cs.ReadWrite(tempUpkeepCost); + cs.readWrite(tempUpkeepCost); ride.upkeepCost = ToMoney64(tempUpkeepCost); } else { - cs.ReadWrite(ride.upkeepCost); + cs.readWrite(ride.upkeepCost); } - cs.ReadWrite(ride.curNumCustomers); - cs.ReadWrite(ride.numCustomersTimeout); + cs.readWrite(ride.curNumCustomers); + cs.readWrite(ride.numCustomersTimeout); - cs.ReadWriteArray(ride.numCustomers, [&cs](uint16_t& v) { - cs.ReadWrite(v); + cs.readWriteArray(ride.numCustomers, [&cs](uint16_t& v) { + cs.readWrite(v); return true; }); - cs.ReadWrite(ride.totalCustomers); - cs.ReadWrite(ride.totalProfit); - cs.ReadWrite(ride.popularity); - cs.ReadWrite(ride.popularityTimeout); - cs.ReadWrite(ride.popularityNext); - cs.ReadWrite(ride.guestsFavourite); - cs.ReadWrite(ride.numPrimaryItemsSold); - cs.ReadWrite(ride.numSecondaryItemsSold); - cs.ReadWrite(ride.incomePerHour); - cs.ReadWrite(ride.profit); - cs.ReadWrite(ride.satisfaction); - cs.ReadWrite(ride.satisfactionTimeout); - cs.ReadWrite(ride.satisfactionNext); + cs.readWrite(ride.totalCustomers); + cs.readWrite(ride.totalProfit); + cs.readWrite(ride.popularity); + cs.readWrite(ride.popularityTimeout); + cs.readWrite(ride.popularityNext); + cs.readWrite(ride.guestsFavourite); + cs.readWrite(ride.numPrimaryItemsSold); + cs.readWrite(ride.numSecondaryItemsSold); + cs.readWrite(ride.incomePerHour); + cs.readWrite(ride.profit); + cs.readWrite(ride.satisfaction); + cs.readWrite(ride.satisfactionTimeout); + cs.readWrite(ride.satisfactionNext); // Breakdown - cs.ReadWrite(ride.breakdownReasonPending); - cs.ReadWrite(ride.mechanicStatus); - cs.ReadWrite(ride.mechanic); - cs.ReadWrite(ride.inspectionStation); - cs.ReadWrite(ride.brokenTrain); - cs.ReadWrite(ride.brokenCar); - cs.ReadWrite(ride.breakdownReason); - cs.ReadWrite(ride.reliabilitySubvalue); - cs.ReadWrite(ride.reliabilityPercentage); - cs.ReadWrite(ride.unreliabilityFactor); - cs.ReadWrite(ride.downtime); - cs.ReadWrite(ride.inspectionInterval); - cs.ReadWrite(ride.lastInspection); + cs.readWrite(ride.breakdownReasonPending); + cs.readWrite(ride.mechanicStatus); + cs.readWrite(ride.mechanic); + cs.readWrite(ride.inspectionStation); + cs.readWrite(ride.brokenTrain); + cs.readWrite(ride.brokenCar); + cs.readWrite(ride.breakdownReason); + cs.readWrite(ride.reliabilitySubvalue); + cs.readWrite(ride.reliabilityPercentage); + cs.readWrite(ride.unreliabilityFactor); + cs.readWrite(ride.downtime); + cs.readWrite(ride.inspectionInterval); + cs.readWrite(ride.lastInspection); - cs.ReadWriteArray(ride.downtimeHistory, [&cs](uint8_t& v) { - cs.ReadWrite(v); + cs.readWriteArray(ride.downtimeHistory, [&cs](uint8_t& v) { + cs.readWrite(v); return true; }); - cs.ReadWrite(ride.breakdownSoundModifier); - cs.ReadWrite(ride.notFixedTimeout); - cs.ReadWrite(ride.lastCrashType); - cs.ReadWrite(ride.connectedMessageThrottle); + cs.readWrite(ride.breakdownSoundModifier); + cs.readWrite(ride.notFixedTimeout); + cs.readWrite(ride.lastCrashType); + cs.readWrite(ride.connectedMessageThrottle); - cs.ReadWrite(ride.vehicleChangeTimeout); + cs.readWrite(ride.vehicleChangeTimeout); - cs.ReadWrite(ride.currentIssues); - cs.ReadWrite(ride.lastIssueTime); + cs.readWrite(ride.currentIssues); + cs.readWrite(ride.lastIssueTime); // Music - cs.ReadWrite(ride.music); - cs.ReadWrite(ride.musicTuneId); - cs.ReadWrite(ride.musicPosition); + cs.readWrite(ride.music); + cs.readWrite(ride.musicTuneId); + cs.readWrite(ride.musicPosition); return true; }); }); @@ -1733,18 +1733,18 @@ namespace OpenRCT2 static void ReadWriteRideMeasurement(OrcaStream::ChunkStream& cs, RideMeasurement& measurement) { - cs.ReadWrite(measurement.flags); - cs.ReadWrite(measurement.last_use_tick); - cs.ReadWrite(measurement.num_items); - cs.ReadWrite(measurement.current_item); - cs.ReadWrite(measurement.vehicle_index); - cs.ReadWrite(measurement.current_station); + cs.readWrite(measurement.flags); + cs.readWrite(measurement.last_use_tick); + cs.readWrite(measurement.num_items); + cs.readWrite(measurement.current_item); + cs.readWrite(measurement.vehicle_index); + cs.readWrite(measurement.current_station); for (size_t i = 0; i < measurement.num_items; i++) { - cs.ReadWrite(measurement.vertical[i]); - cs.ReadWrite(measurement.lateral[i]); - cs.ReadWrite(measurement.velocity[i]); - cs.ReadWrite(measurement.altitude[i]); + cs.readWrite(measurement.vertical[i]); + cs.readWrite(measurement.lateral[i]); + cs.readWrite(measurement.velocity[i]); + cs.readWrite(measurement.altitude[i]); } } @@ -1753,14 +1753,14 @@ namespace OpenRCT2 static void ReadWriteEntityCommon(OrcaStream::ChunkStream& cs, EntityBase& entity) { - cs.ReadWrite(entity.Id); - cs.ReadWrite(entity.SpriteData.HeightMin); - cs.ReadWrite(entity.x); - cs.ReadWrite(entity.y); - cs.ReadWrite(entity.z); - cs.ReadWrite(entity.SpriteData.Width); - cs.ReadWrite(entity.SpriteData.HeightMax); - cs.ReadWrite(entity.Orientation); + cs.readWrite(entity.Id); + cs.readWrite(entity.SpriteData.HeightMin); + cs.readWrite(entity.x); + cs.readWrite(entity.y); + cs.readWrite(entity.z); + cs.readWrite(entity.SpriteData.Width); + cs.readWrite(entity.SpriteData.HeightMax); + cs.readWrite(entity.Orientation); } static std::vector LegacyGetRideTypesBeenOn(const std::array& srcArray) @@ -1797,98 +1797,98 @@ namespace OpenRCT2 auto guest = entity.As(); auto staff = entity.As(); - if (cs.GetMode() == OrcaStream::Mode::reading) + if (cs.getMode() == OrcaStream::Mode::reading) { - auto name = cs.Read(); + auto name = cs.read(); entity.SetName(name); } else { - cs.Write(static_cast(entity.Name)); + cs.write(static_cast(entity.Name)); } - cs.ReadWrite(entity.NextLoc); - cs.ReadWrite(entity.NextFlags); + cs.readWrite(entity.NextLoc); + cs.readWrite(entity.NextFlags); if (version <= 1) { if (guest != nullptr) { - cs.ReadWrite(guest->OutsideOfPark); + cs.readWrite(guest->OutsideOfPark); } else { - cs.Ignore(); + cs.ignore(); } } - cs.ReadWrite(entity.State); - cs.ReadWrite(entity.SubState); + cs.readWrite(entity.State); + cs.readWrite(entity.SubState); if (version >= kPeepAnimationObjectsVersion) - cs.ReadWrite(entity.AnimationObjectIndex); + cs.readWrite(entity.AnimationObjectIndex); else entity.AnimationObjectIndex = kObjectEntryIndexNull; - cs.ReadWrite(entity.AnimationGroup); + cs.readWrite(entity.AnimationGroup); if (version <= 1) { if (guest != nullptr) { - cs.ReadWrite(guest->GuestNumRides); + cs.readWrite(guest->GuestNumRides); } else { - cs.ReadWrite(staff->AssignedStaffType); + cs.readWrite(staff->AssignedStaffType); } } - cs.ReadWrite(entity.TshirtColour); - cs.ReadWrite(entity.TrousersColour); - cs.ReadWrite(entity.DestinationX); - cs.ReadWrite(entity.DestinationY); - cs.ReadWrite(entity.DestinationTolerance); - cs.ReadWrite(entity.Var37); - cs.ReadWrite(entity.Energy); - cs.ReadWrite(entity.EnergyTarget); + cs.readWrite(entity.TshirtColour); + cs.readWrite(entity.TrousersColour); + cs.readWrite(entity.DestinationX); + cs.readWrite(entity.DestinationY); + cs.readWrite(entity.DestinationTolerance); + cs.readWrite(entity.Var37); + cs.readWrite(entity.Energy); + cs.readWrite(entity.EnergyTarget); if (version <= 1) { if (guest != nullptr) { - cs.ReadWrite(guest->Happiness); - cs.ReadWrite(guest->HappinessTarget); - cs.ReadWrite(guest->Nausea); - cs.ReadWrite(guest->NauseaTarget); - cs.ReadWrite(guest->Hunger); - cs.ReadWrite(guest->Thirst); - cs.ReadWrite(guest->Toilet); + cs.readWrite(guest->Happiness); + cs.readWrite(guest->HappinessTarget); + cs.readWrite(guest->Nausea); + cs.readWrite(guest->NauseaTarget); + cs.readWrite(guest->Hunger); + cs.readWrite(guest->Thirst); + cs.readWrite(guest->Toilet); } else { - cs.Ignore(); - cs.Ignore(); - cs.Ignore(); - cs.Ignore(); - cs.Ignore(); - cs.Ignore(); - cs.Ignore(); + cs.ignore(); + cs.ignore(); + cs.ignore(); + cs.ignore(); + cs.ignore(); + cs.ignore(); + cs.ignore(); } } - cs.ReadWrite(entity.Mass); + cs.readWrite(entity.Mass); if (version <= 1) { if (guest != nullptr) { - cs.ReadWrite(guest->TimeToConsume); + cs.readWrite(guest->TimeToConsume); } else { uint8_t temp{}; - cs.ReadWrite(temp); + cs.readWrite(temp); } } @@ -1896,111 +1896,111 @@ namespace OpenRCT2 { if (guest != nullptr) { - if (cs.GetMode() == OrcaStream::Mode::reading) + if (cs.getMode() == OrcaStream::Mode::reading) { - guest->Intensity = IntensityRange(cs.Read()); + guest->Intensity = IntensityRange(cs.read()); } else { - cs.Write(static_cast(guest->Intensity)); + cs.write(static_cast(guest->Intensity)); } - cs.ReadWrite(guest->NauseaTolerance); + cs.readWrite(guest->NauseaTolerance); } else { - cs.Ignore(); - cs.Ignore(); + cs.ignore(); + cs.ignore(); } } - cs.ReadWrite(entity.WindowInvalidateFlags); + cs.readWrite(entity.WindowInvalidateFlags); if (version <= 1) { if (guest != nullptr) { money16 tempPaidOnDrink{}; - cs.ReadWrite(tempPaidOnDrink); + cs.readWrite(tempPaidOnDrink); guest->PaidOnDrink = ToMoney64(tempPaidOnDrink); std::array rideTypeBeenOn; - cs.ReadWriteArray(rideTypeBeenOn, [&cs](uint8_t& rideType) { - cs.ReadWrite(rideType); + cs.readWriteArray(rideTypeBeenOn, [&cs](uint8_t& rideType) { + cs.readWrite(rideType); return true; }); OpenRCT2::RideUse::GetTypeHistory().Set(guest->Id, LegacyGetRideTypesBeenOn(rideTypeBeenOn)); - cs.ReadWrite(guest->ItemFlags); - cs.ReadWrite(guest->Photo2RideRef); - cs.ReadWrite(guest->Photo3RideRef); - cs.ReadWrite(guest->Photo4RideRef); + cs.readWrite(guest->ItemFlags); + cs.readWrite(guest->Photo2RideRef); + cs.readWrite(guest->Photo3RideRef); + cs.readWrite(guest->Photo4RideRef); } else { - cs.Ignore(); + cs.ignore(); std::vector temp; - cs.ReadWriteVector(temp, [&cs](uint8_t& rideType) { - cs.ReadWrite(rideType); + cs.readWriteVector(temp, [&cs](uint8_t& rideType) { + cs.readWrite(rideType); return true; }); - cs.Ignore(); - cs.Ignore(); - cs.Ignore(); - cs.Ignore(); + cs.ignore(); + cs.ignore(); + cs.ignore(); + cs.ignore(); } } - cs.ReadWrite(entity.CurrentRide); - cs.ReadWrite(entity.CurrentRideStation); - cs.ReadWrite(entity.CurrentTrain); - cs.ReadWrite(entity.TimeToSitdown); - cs.ReadWrite(entity.SpecialSprite); - cs.ReadWrite(entity.AnimationType); - cs.ReadWrite(entity.NextAnimationType); - cs.ReadWrite(entity.AnimationImageIdOffset); - cs.ReadWrite(entity.Action); - cs.ReadWrite(entity.AnimationFrameNum); - cs.ReadWrite(entity.StepProgress); + cs.readWrite(entity.CurrentRide); + cs.readWrite(entity.CurrentRideStation); + cs.readWrite(entity.CurrentTrain); + cs.readWrite(entity.TimeToSitdown); + cs.readWrite(entity.SpecialSprite); + cs.readWrite(entity.AnimationType); + cs.readWrite(entity.NextAnimationType); + cs.readWrite(entity.AnimationImageIdOffset); + cs.readWrite(entity.Action); + cs.readWrite(entity.AnimationFrameNum); + cs.readWrite(entity.StepProgress); if (version <= 1) { if (guest != nullptr) { - cs.ReadWrite(guest->GuestNextInQueue); + cs.readWrite(guest->GuestNextInQueue); } else { - cs.ReadWrite(staff->MechanicTimeSinceCall); + cs.readWrite(staff->MechanicTimeSinceCall); } } - cs.ReadWrite(entity.PeepDirection); - cs.ReadWrite(entity.InteractionRideIndex); + cs.readWrite(entity.PeepDirection); + cs.readWrite(entity.InteractionRideIndex); if (version <= 1) { if (guest != nullptr) { - cs.ReadWrite(guest->TimeInQueue); + cs.readWrite(guest->TimeInQueue); std::array ridesBeenOn; - cs.ReadWriteArray(ridesBeenOn, [&cs](uint8_t& rideType) { - cs.ReadWrite(rideType); + cs.readWriteArray(ridesBeenOn, [&cs](uint8_t& rideType) { + cs.readWrite(rideType); return true; }); OpenRCT2::RideUse::GetHistory().Set(guest->Id, LegacyGetRidesBeenOn(ridesBeenOn)); } else { - cs.Ignore(); + cs.ignore(); std::vector ridesBeenOn; - cs.ReadWriteVector(ridesBeenOn, [&cs](uint8_t& rideId) { - cs.ReadWrite(rideId); + cs.readWriteVector(ridesBeenOn, [&cs](uint8_t& rideId) { + cs.readWrite(rideId); return true; }); } } - cs.ReadWrite(entity.PeepId); + cs.readWrite(entity.PeepId); if (version <= 1) { @@ -2008,20 +2008,20 @@ namespace OpenRCT2 { money32 tempCashInPocket{}; money32 tempCashSpent{}; - cs.ReadWrite(tempCashInPocket); - cs.ReadWrite(tempCashSpent); + cs.readWrite(tempCashInPocket); + cs.readWrite(tempCashSpent); guest->CashInPocket = ToMoney64(tempCashInPocket); guest->CashSpent = ToMoney64(tempCashSpent); - cs.ReadWrite(guest->ParkEntryTime); - cs.ReadWrite(guest->RejoinQueueTimeout); - cs.ReadWrite(guest->PreviousRide); - cs.ReadWrite(guest->PreviousRideTimeOut); - cs.ReadWriteArray(guest->Thoughts, [&cs](PeepThought& thought) { - cs.ReadWrite(thought.type); + cs.readWrite(guest->ParkEntryTime); + cs.readWrite(guest->RejoinQueueTimeout); + cs.readWrite(guest->PreviousRide); + cs.readWrite(guest->PreviousRideTimeOut); + cs.readWriteArray(guest->Thoughts, [&cs](PeepThought& thought) { + cs.readWrite(thought.type); uint8_t item{}; - cs.ReadWrite(item); + cs.readWrite(item); if (item == 255) { thought.item = kPeepThoughtItemNone; @@ -2031,121 +2031,121 @@ namespace OpenRCT2 thought.item = item; } - cs.ReadWrite(thought.freshness); - cs.ReadWrite(thought.fresh_timeout); + cs.readWrite(thought.freshness); + cs.readWrite(thought.fresh_timeout); return true; }); } else { - cs.Ignore(); - cs.Ignore(); - cs.ReadWrite(staff->HireDate); - cs.Ignore(); - cs.Ignore(); - cs.Ignore(); + cs.ignore(); + cs.ignore(); + cs.readWrite(staff->HireDate); + cs.ignore(); + cs.ignore(); + cs.ignore(); std::vector temp; - cs.ReadWriteVector(temp, [&cs](PeepThought& thought) { - cs.ReadWrite(thought.type); - cs.ReadWrite(thought.item); - cs.ReadWrite(thought.freshness); - cs.ReadWrite(thought.fresh_timeout); + cs.readWriteVector(temp, [&cs](PeepThought& thought) { + cs.readWrite(thought.type); + cs.readWrite(thought.item); + cs.readWrite(thought.freshness); + cs.readWrite(thought.fresh_timeout); return true; }); } } - cs.ReadWrite(entity.PathCheckOptimisation); + cs.readWrite(entity.PathCheckOptimisation); if (version <= 1) { if (guest != nullptr) { - cs.ReadWrite(guest->GuestHeadingToRideId); - cs.ReadWrite(guest->GuestIsLostCountdown); - cs.ReadWrite(guest->Photo1RideRef); + cs.readWrite(guest->GuestHeadingToRideId); + cs.readWrite(guest->GuestIsLostCountdown); + cs.readWrite(guest->Photo1RideRef); } else { - cs.Ignore(); - cs.ReadWrite(staff->StaffOrders); - cs.Ignore(); + cs.ignore(); + cs.readWrite(staff->StaffOrders); + cs.ignore(); } } - cs.ReadWrite(entity.PeepFlags); - cs.ReadWrite(entity.PathfindGoal.x); - cs.ReadWrite(entity.PathfindGoal.y); - cs.ReadWrite(entity.PathfindGoal.z); - cs.ReadWrite(entity.PathfindGoal.direction); + cs.readWrite(entity.PeepFlags); + cs.readWrite(entity.PathfindGoal.x); + cs.readWrite(entity.PathfindGoal.y); + cs.readWrite(entity.PathfindGoal.z); + cs.readWrite(entity.PathfindGoal.direction); for (size_t i = 0; i < std::size(entity.PathfindHistory); i++) { - cs.ReadWrite(entity.PathfindHistory[i].x); - cs.ReadWrite(entity.PathfindHistory[i].y); - cs.ReadWrite(entity.PathfindHistory[i].z); - cs.ReadWrite(entity.PathfindHistory[i].direction); + cs.readWrite(entity.PathfindHistory[i].x); + cs.readWrite(entity.PathfindHistory[i].y); + cs.readWrite(entity.PathfindHistory[i].z); + cs.readWrite(entity.PathfindHistory[i].direction); } - cs.ReadWrite(entity.WalkingAnimationFrameNum); + cs.readWrite(entity.WalkingAnimationFrameNum); if (version <= 1) { if (guest != nullptr) { - cs.ReadWrite(guest->LitterCount); - cs.ReadWrite(guest->GuestTimeOnRide); - cs.ReadWrite(guest->DisgustingCount); + cs.readWrite(guest->LitterCount); + cs.readWrite(guest->GuestTimeOnRide); + cs.readWrite(guest->DisgustingCount); money16 expenditures[4]{}; - cs.ReadWrite(expenditures[0]); - cs.ReadWrite(expenditures[1]); - cs.ReadWrite(expenditures[2]); - cs.ReadWrite(expenditures[3]); + cs.readWrite(expenditures[0]); + cs.readWrite(expenditures[1]); + cs.readWrite(expenditures[2]); + cs.readWrite(expenditures[3]); guest->PaidToEnter = ToMoney64(expenditures[0]); guest->PaidOnRides = ToMoney64(expenditures[1]); guest->PaidOnFood = ToMoney64(expenditures[2]); guest->PaidOnSouvenirs = ToMoney64(expenditures[3]); - cs.ReadWrite(guest->AmountOfFood); - cs.ReadWrite(guest->AmountOfDrinks); - cs.ReadWrite(guest->AmountOfSouvenirs); - cs.ReadWrite(guest->VandalismSeen); - cs.ReadWrite(guest->VoucherType); - cs.ReadWrite(guest->VoucherRideId); - cs.ReadWrite(guest->SurroundingsThoughtTimeout); - cs.ReadWrite(guest->Angriness); - cs.ReadWrite(guest->TimeLost); - cs.ReadWrite(guest->DaysInQueue); - cs.ReadWrite(guest->BalloonColour); - cs.ReadWrite(guest->UmbrellaColour); - cs.ReadWrite(guest->HatColour); - cs.ReadWrite(guest->FavouriteRide); - cs.ReadWrite(guest->FavouriteRideRating); + cs.readWrite(guest->AmountOfFood); + cs.readWrite(guest->AmountOfDrinks); + cs.readWrite(guest->AmountOfSouvenirs); + cs.readWrite(guest->VandalismSeen); + cs.readWrite(guest->VoucherType); + cs.readWrite(guest->VoucherRideId); + cs.readWrite(guest->SurroundingsThoughtTimeout); + cs.readWrite(guest->Angriness); + cs.readWrite(guest->TimeLost); + cs.readWrite(guest->DaysInQueue); + cs.readWrite(guest->BalloonColour); + cs.readWrite(guest->UmbrellaColour); + cs.readWrite(guest->HatColour); + cs.readWrite(guest->FavouriteRide); + cs.readWrite(guest->FavouriteRideRating); } else { - cs.Ignore(); - cs.ReadWrite(staff->StaffMowingTimeout); - cs.Ignore(); - cs.ReadWrite(staff->StaffLawnsMown); - cs.ReadWrite(staff->StaffGardensWatered); - cs.ReadWrite(staff->StaffLitterSwept); - cs.ReadWrite(staff->StaffBinsEmptied); - cs.Ignore(); - cs.Ignore(); - cs.Ignore(); - cs.Ignore(); - cs.Ignore(); - cs.Ignore(); - cs.Ignore(); - cs.Ignore(); - cs.Ignore(); - cs.Ignore(); - cs.Ignore(); - cs.Ignore(); - cs.Ignore(); - cs.Ignore(); - cs.Ignore(); + cs.ignore(); + cs.readWrite(staff->StaffMowingTimeout); + cs.ignore(); + cs.readWrite(staff->StaffLawnsMown); + cs.readWrite(staff->StaffGardensWatered); + cs.readWrite(staff->StaffLitterSwept); + cs.readWrite(staff->StaffBinsEmptied); + cs.ignore(); + cs.ignore(); + cs.ignore(); + cs.ignore(); + cs.ignore(); + cs.ignore(); + cs.ignore(); + cs.ignore(); + cs.ignore(); + cs.ignore(); + cs.ignore(); + cs.ignore(); + cs.ignore(); + cs.ignore(); + cs.ignore(); } } } @@ -2166,15 +2166,15 @@ namespace OpenRCT2 static void ReadWriteStringTable(OrcaStream::ChunkStream& cs, std::string& value, const std::string_view lcode) { std::vector> table; - if (cs.GetMode() != OrcaStream::Mode::reading) + if (cs.getMode() != OrcaStream::Mode::reading) { table.push_back(std::make_tuple(std::string(lcode), value)); } - cs.ReadWriteVector(table, [&cs](std::tuple& v) { - cs.ReadWrite(std::get<0>(v)); - cs.ReadWrite(std::get<1>(v)); + cs.readWriteVector(table, [&cs](std::tuple& v) { + cs.readWrite(std::get<0>(v)); + cs.readWrite(std::get<1>(v)); }); - if (cs.GetMode() == OrcaStream::Mode::reading) + if (cs.getMode() == OrcaStream::Mode::reading) { auto fr = std::find_if(table.begin(), table.end(), [lcode](const std::tuple& v) { return std::get<0>(v) == lcode; @@ -2199,116 +2199,116 @@ namespace OpenRCT2 void ParkFile::ReadWriteEntity(OrcaStream& os, OrcaStream::ChunkStream& cs, Vehicle& entity) { ReadWriteEntityCommon(cs, entity); - cs.ReadWrite(entity.SubType); - cs.ReadWrite(entity.Pitch); - cs.ReadWrite(entity.bank_rotation); - cs.ReadWrite(entity.remaining_distance); - cs.ReadWrite(entity.velocity); - cs.ReadWrite(entity.acceleration); - cs.ReadWrite(entity.ride); - cs.ReadWrite(entity.vehicle_type); - cs.ReadWrite(entity.colours.Body); - cs.ReadWrite(entity.colours.Trim); - cs.ReadWrite(entity.track_progress); - cs.ReadWrite(entity.BoatLocation); - cs.ReadWrite(entity.TrackTypeAndDirection); - cs.ReadWrite(entity.TrackLocation.x); - cs.ReadWrite(entity.TrackLocation.y); - cs.ReadWrite(entity.TrackLocation.z); - cs.ReadWrite(entity.next_vehicle_on_train); - cs.ReadWrite(entity.prev_vehicle_on_ride); - cs.ReadWrite(entity.next_vehicle_on_ride); - cs.ReadWrite(entity.var_44); - cs.ReadWrite(entity.mass); - if (cs.GetMode() == OrcaStream::Mode::reading && os.getHeader().targetVersion < 18) + cs.readWrite(entity.SubType); + cs.readWrite(entity.Pitch); + cs.readWrite(entity.bank_rotation); + cs.readWrite(entity.remaining_distance); + cs.readWrite(entity.velocity); + cs.readWrite(entity.acceleration); + cs.readWrite(entity.ride); + cs.readWrite(entity.vehicle_type); + cs.readWrite(entity.colours.Body); + cs.readWrite(entity.colours.Trim); + cs.readWrite(entity.track_progress); + cs.readWrite(entity.BoatLocation); + cs.readWrite(entity.TrackTypeAndDirection); + cs.readWrite(entity.TrackLocation.x); + cs.readWrite(entity.TrackLocation.y); + cs.readWrite(entity.TrackLocation.z); + cs.readWrite(entity.next_vehicle_on_train); + cs.readWrite(entity.prev_vehicle_on_ride); + cs.readWrite(entity.next_vehicle_on_ride); + cs.readWrite(entity.var_44); + cs.readWrite(entity.mass); + if (cs.getMode() == OrcaStream::Mode::reading && os.getHeader().targetVersion < 18) { uint16_t updateFlags = 0; - cs.ReadWrite(updateFlags); + cs.readWrite(updateFlags); entity.Flags = updateFlags; } else { - cs.ReadWrite(entity.Flags); + cs.readWrite(entity.Flags); } - cs.ReadWrite(entity.SwingSprite); - cs.ReadWrite(entity.current_station); - cs.ReadWrite(entity.current_time); - cs.ReadWrite(entity.crash_z); - cs.ReadWrite(entity.status); - cs.ReadWrite(entity.sub_state); + cs.readWrite(entity.SwingSprite); + cs.readWrite(entity.current_station); + cs.readWrite(entity.current_time); + cs.readWrite(entity.crash_z); + cs.readWrite(entity.status); + cs.readWrite(entity.sub_state); for (size_t i = 0; i < std::size(entity.peep); i++) { - cs.ReadWrite(entity.peep[i]); - cs.ReadWrite(entity.peep_tshirt_colours[i]); + cs.readWrite(entity.peep[i]); + cs.readWrite(entity.peep_tshirt_colours[i]); } - cs.ReadWrite(entity.num_seats); - cs.ReadWrite(entity.num_peeps); - cs.ReadWrite(entity.next_free_seat); - cs.ReadWrite(entity.restraints_position); - cs.ReadWrite(entity.crash_x); - cs.ReadWrite(entity.sound2_flags); - cs.ReadWrite(entity.spin_sprite); - cs.ReadWrite(entity.sound1_id); - cs.ReadWrite(entity.sound1_volume); - cs.ReadWrite(entity.sound2_id); - cs.ReadWrite(entity.sound2_volume); - cs.ReadWrite(entity.sound_vector_factor); - cs.ReadWrite(entity.time_waiting); - cs.ReadWrite(entity.speed); - cs.ReadWrite(entity.powered_acceleration); - cs.ReadWrite(entity.CollisionDetectionTimer); - cs.ReadWrite(entity.animation_frame); - if (cs.GetMode() == OrcaStream::Mode::reading && os.getHeader().targetVersion <= 2) + cs.readWrite(entity.num_seats); + cs.readWrite(entity.num_peeps); + cs.readWrite(entity.next_free_seat); + cs.readWrite(entity.restraints_position); + cs.readWrite(entity.crash_x); + cs.readWrite(entity.sound2_flags); + cs.readWrite(entity.spin_sprite); + cs.readWrite(entity.sound1_id); + cs.readWrite(entity.sound1_volume); + cs.readWrite(entity.sound2_id); + cs.readWrite(entity.sound2_volume); + cs.readWrite(entity.sound_vector_factor); + cs.readWrite(entity.time_waiting); + cs.readWrite(entity.speed); + cs.readWrite(entity.powered_acceleration); + cs.readWrite(entity.CollisionDetectionTimer); + cs.readWrite(entity.animation_frame); + if (cs.getMode() == OrcaStream::Mode::reading && os.getHeader().targetVersion <= 2) { uint16_t lower = 0, upper = 0; - cs.ReadWrite(lower); - cs.ReadWrite(upper); + cs.readWrite(lower); + cs.readWrite(upper); entity.animationState = lower | (upper << 16); } else { - cs.ReadWrite(entity.animationState); + cs.readWrite(entity.animationState); } - cs.ReadWrite(entity.scream_sound_id); - cs.ReadWrite(entity.TrackSubposition); - cs.ReadWrite(entity.NumLaps); - if (cs.GetMode() == OrcaStream::Mode::reading && os.getHeader().targetVersion < kBlockBrakeImprovementsVersion) + cs.readWrite(entity.scream_sound_id); + cs.readWrite(entity.TrackSubposition); + cs.readWrite(entity.NumLaps); + if (cs.getMode() == OrcaStream::Mode::reading && os.getHeader().targetVersion < kBlockBrakeImprovementsVersion) { uint8_t brakeSpeed; - cs.ReadWrite(brakeSpeed); + cs.readWrite(brakeSpeed); if (entity.GetTrackType() == TrackElemType::BlockBrakes) brakeSpeed = kRCT2DefaultBlockBrakeSpeed; entity.brake_speed = brakeSpeed; } else { - cs.ReadWrite(entity.brake_speed); + cs.readWrite(entity.brake_speed); } - cs.ReadWrite(entity.lost_time_out); - cs.ReadWrite(entity.vertical_drop_countdown); - cs.ReadWrite(entity.var_D3); - cs.ReadWrite(entity.mini_golf_current_animation); - cs.ReadWrite(entity.mini_golf_flags); - cs.ReadWrite(entity.ride_subtype); - cs.ReadWrite(entity.colours.Tertiary); - cs.ReadWrite(entity.seat_rotation); - cs.ReadWrite(entity.target_seat_rotation); - if (cs.GetMode() == OrcaStream::Mode::reading && os.getHeader().targetVersion < 18) + cs.readWrite(entity.lost_time_out); + cs.readWrite(entity.vertical_drop_countdown); + cs.readWrite(entity.var_D3); + cs.readWrite(entity.mini_golf_current_animation); + cs.readWrite(entity.mini_golf_flags); + cs.readWrite(entity.ride_subtype); + cs.readWrite(entity.colours.Tertiary); + cs.readWrite(entity.seat_rotation); + cs.readWrite(entity.target_seat_rotation); + if (cs.getMode() == OrcaStream::Mode::reading && os.getHeader().targetVersion < 18) { bool isCrashedVehicle = false; - cs.ReadWrite(isCrashedVehicle); + cs.readWrite(isCrashedVehicle); if (isCrashedVehicle) { entity.SetFlag(VehicleFlags::Crashed); } } - if (cs.GetMode() == OrcaStream::Mode::reading && os.getHeader().targetVersion < kBlockBrakeImprovementsVersion) + if (cs.getMode() == OrcaStream::Mode::reading && os.getHeader().targetVersion < kBlockBrakeImprovementsVersion) { entity.BlockBrakeSpeed = kRCT2DefaultBlockBrakeSpeed; } else { - cs.ReadWrite(entity.BlockBrakeSpeed); + cs.readWrite(entity.BlockBrakeSpeed); } } @@ -2323,21 +2323,21 @@ namespace OpenRCT2 return; } - cs.ReadWrite(guest.GuestNumRides); - cs.ReadWrite(guest.GuestNextInQueue); - cs.ReadWrite(guest.ParkEntryTime); - cs.ReadWrite(guest.GuestHeadingToRideId); - cs.ReadWrite(guest.GuestIsLostCountdown); - cs.ReadWrite(guest.GuestTimeOnRide); + cs.readWrite(guest.GuestNumRides); + cs.readWrite(guest.GuestNextInQueue); + cs.readWrite(guest.ParkEntryTime); + cs.readWrite(guest.GuestHeadingToRideId); + cs.readWrite(guest.GuestIsLostCountdown); + cs.readWrite(guest.GuestTimeOnRide); if (version <= 18) { money16 expenditures[5]{}; - cs.ReadWrite(expenditures[0]); - cs.ReadWrite(expenditures[1]); - cs.ReadWrite(expenditures[2]); - cs.ReadWrite(expenditures[3]); - cs.ReadWrite(expenditures[4]); + cs.readWrite(expenditures[0]); + cs.readWrite(expenditures[1]); + cs.readWrite(expenditures[2]); + cs.readWrite(expenditures[3]); + cs.readWrite(expenditures[4]); guest.PaidToEnter = ToMoney64(expenditures[0]); guest.PaidOnRides = ToMoney64(expenditures[1]); guest.PaidOnFood = ToMoney64(expenditures[2]); @@ -2346,61 +2346,61 @@ namespace OpenRCT2 } else { - cs.ReadWrite(guest.PaidToEnter); - cs.ReadWrite(guest.PaidOnRides); - cs.ReadWrite(guest.PaidOnFood); - cs.ReadWrite(guest.PaidOnDrink); - cs.ReadWrite(guest.PaidOnSouvenirs); + cs.readWrite(guest.PaidToEnter); + cs.readWrite(guest.PaidOnRides); + cs.readWrite(guest.PaidOnFood); + cs.readWrite(guest.PaidOnDrink); + cs.readWrite(guest.PaidOnSouvenirs); } - cs.ReadWrite(guest.OutsideOfPark); - cs.ReadWrite(guest.Happiness); - cs.ReadWrite(guest.HappinessTarget); - cs.ReadWrite(guest.Nausea); - cs.ReadWrite(guest.NauseaTarget); - cs.ReadWrite(guest.Hunger); - cs.ReadWrite(guest.Thirst); - cs.ReadWrite(guest.Toilet); - cs.ReadWrite(guest.TimeToConsume); - if (cs.GetMode() == OrcaStream::Mode::reading) + cs.readWrite(guest.OutsideOfPark); + cs.readWrite(guest.Happiness); + cs.readWrite(guest.HappinessTarget); + cs.readWrite(guest.Nausea); + cs.readWrite(guest.NauseaTarget); + cs.readWrite(guest.Hunger); + cs.readWrite(guest.Thirst); + cs.readWrite(guest.Toilet); + cs.readWrite(guest.TimeToConsume); + if (cs.getMode() == OrcaStream::Mode::reading) { - guest.Intensity = IntensityRange(cs.Read()); + guest.Intensity = IntensityRange(cs.read()); } else { - cs.Write(static_cast(guest.Intensity)); + cs.write(static_cast(guest.Intensity)); } - cs.ReadWrite(guest.NauseaTolerance); + cs.readWrite(guest.NauseaTolerance); if (os.getHeader().targetVersion < 3) { std::array rideTypeBeenOn; - cs.ReadWriteArray(rideTypeBeenOn, [&cs](uint8_t& rideType) { - cs.ReadWrite(rideType); + cs.readWriteArray(rideTypeBeenOn, [&cs](uint8_t& rideType) { + cs.readWrite(rideType); return true; }); OpenRCT2::RideUse::GetTypeHistory().Set(guest.Id, LegacyGetRideTypesBeenOn(rideTypeBeenOn)); } - cs.ReadWrite(guest.TimeInQueue); + cs.readWrite(guest.TimeInQueue); if (os.getHeader().targetVersion < 3) { std::array ridesBeenOn; - cs.ReadWriteArray(ridesBeenOn, [&cs](uint8_t& rideType) { - cs.ReadWrite(rideType); + cs.readWriteArray(ridesBeenOn, [&cs](uint8_t& rideType) { + cs.readWrite(rideType); return true; }); OpenRCT2::RideUse::GetHistory().Set(guest.Id, LegacyGetRidesBeenOn(ridesBeenOn)); } else { - if (cs.GetMode() == OrcaStream::Mode::reading) + if (cs.getMode() == OrcaStream::Mode::reading) { std::vector rideUse; - cs.ReadWriteVector(rideUse, [&cs](RideId& rideId) { cs.ReadWrite(rideId); }); + cs.readWriteVector(rideUse, [&cs](RideId& rideId) { cs.readWrite(rideId); }); OpenRCT2::RideUse::GetHistory().Set(guest.Id, std::move(rideUse)); std::vector rideTypeUse; - cs.ReadWriteVector(rideTypeUse, [&cs](ObjectEntryIndex& rideType) { cs.ReadWrite(rideType); }); + cs.readWriteVector(rideTypeUse, [&cs](ObjectEntryIndex& rideType) { cs.readWrite(rideType); }); OpenRCT2::RideUse::GetTypeHistory().Set(guest.Id, std::move(rideTypeUse)); } else @@ -2409,21 +2409,21 @@ namespace OpenRCT2 if (rideUse == nullptr) { std::vector empty; - cs.ReadWriteVector(empty, [&cs](RideId& rideId) { cs.ReadWrite(rideId); }); + cs.readWriteVector(empty, [&cs](RideId& rideId) { cs.readWrite(rideId); }); } else { - cs.ReadWriteVector(*rideUse, [&cs](RideId& rideId) { cs.ReadWrite(rideId); }); + cs.readWriteVector(*rideUse, [&cs](RideId& rideId) { cs.readWrite(rideId); }); } auto* rideTypeUse = OpenRCT2::RideUse::GetTypeHistory().GetAll(guest.Id); if (rideTypeUse == nullptr) { std::vector empty; - cs.ReadWriteVector(empty, [&cs](ObjectEntryIndex& rideId) { cs.ReadWrite(rideId); }); + cs.readWriteVector(empty, [&cs](ObjectEntryIndex& rideId) { cs.readWrite(rideId); }); } else { - cs.ReadWriteVector(*rideTypeUse, [&cs](ObjectEntryIndex& rideId) { cs.ReadWrite(rideId); }); + cs.readWriteVector(*rideTypeUse, [&cs](ObjectEntryIndex& rideId) { cs.readWrite(rideId); }); } } } @@ -2431,58 +2431,58 @@ namespace OpenRCT2 { money32 tempCashInPocket{}; money32 tempCashSpent{}; - cs.ReadWrite(tempCashInPocket); - cs.ReadWrite(tempCashSpent); + cs.readWrite(tempCashInPocket); + cs.readWrite(tempCashSpent); guest.CashInPocket = ToMoney64(tempCashInPocket); guest.CashSpent = ToMoney64(tempCashSpent); } else { - cs.ReadWrite(guest.CashInPocket); - cs.ReadWrite(guest.CashSpent); + cs.readWrite(guest.CashInPocket); + cs.readWrite(guest.CashSpent); } - cs.ReadWrite(guest.Photo1RideRef); - cs.ReadWrite(guest.Photo2RideRef); - cs.ReadWrite(guest.Photo3RideRef); - cs.ReadWrite(guest.Photo4RideRef); - cs.ReadWrite(guest.RejoinQueueTimeout); - cs.ReadWrite(guest.PreviousRide); - cs.ReadWrite(guest.PreviousRideTimeOut); - cs.ReadWriteArray(guest.Thoughts, [version = os.getHeader().targetVersion, &cs](PeepThought& thought) { - cs.ReadWrite(thought.type); + cs.readWrite(guest.Photo1RideRef); + cs.readWrite(guest.Photo2RideRef); + cs.readWrite(guest.Photo3RideRef); + cs.readWrite(guest.Photo4RideRef); + cs.readWrite(guest.RejoinQueueTimeout); + cs.readWrite(guest.PreviousRide); + cs.readWrite(guest.PreviousRideTimeOut); + cs.readWriteArray(guest.Thoughts, [version = os.getHeader().targetVersion, &cs](PeepThought& thought) { + cs.readWrite(thought.type); if (version <= 2) { int16_t item{}; - cs.ReadWrite(item); + cs.readWrite(item); thought.item = item; } else { - cs.ReadWrite(thought.item); + cs.readWrite(thought.item); } - cs.ReadWrite(thought.freshness); - cs.ReadWrite(thought.fresh_timeout); + cs.readWrite(thought.freshness); + cs.readWrite(thought.fresh_timeout); return true; }); - cs.ReadWrite(guest.LitterCount); - cs.ReadWrite(guest.DisgustingCount); - cs.ReadWrite(guest.AmountOfFood); - cs.ReadWrite(guest.AmountOfDrinks); - cs.ReadWrite(guest.AmountOfSouvenirs); - cs.ReadWrite(guest.VandalismSeen); - cs.ReadWrite(guest.VoucherType); - cs.ReadWrite(guest.VoucherRideId); - cs.ReadWrite(guest.SurroundingsThoughtTimeout); - cs.ReadWrite(guest.Angriness); - cs.ReadWrite(guest.TimeLost); - cs.ReadWrite(guest.DaysInQueue); - cs.ReadWrite(guest.BalloonColour); - cs.ReadWrite(guest.UmbrellaColour); - cs.ReadWrite(guest.HatColour); - cs.ReadWrite(guest.FavouriteRide); - cs.ReadWrite(guest.FavouriteRideRating); - cs.ReadWrite(guest.ItemFlags); + cs.readWrite(guest.LitterCount); + cs.readWrite(guest.DisgustingCount); + cs.readWrite(guest.AmountOfFood); + cs.readWrite(guest.AmountOfDrinks); + cs.readWrite(guest.AmountOfSouvenirs); + cs.readWrite(guest.VandalismSeen); + cs.readWrite(guest.VoucherType); + cs.readWrite(guest.VoucherRideId); + cs.readWrite(guest.SurroundingsThoughtTimeout); + cs.readWrite(guest.Angriness); + cs.readWrite(guest.TimeLost); + cs.readWrite(guest.DaysInQueue); + cs.readWrite(guest.BalloonColour); + cs.readWrite(guest.UmbrellaColour); + cs.readWrite(guest.HatColour); + cs.readWrite(guest.FavouriteRide); + cs.readWrite(guest.FavouriteRideRating); + cs.readWrite(guest.ItemFlags); } template<> @@ -2491,12 +2491,12 @@ namespace OpenRCT2 ReadWritePeep(os, cs, entity); std::vector patrolArea; - if (cs.GetMode() == OrcaStream::Mode::writing && entity.PatrolInfo != nullptr) + if (cs.getMode() == OrcaStream::Mode::writing && entity.PatrolInfo != nullptr) { patrolArea = entity.PatrolInfo->ToVector(); } - cs.ReadWriteVector(patrolArea, [&cs](TileCoordsXY& value) { cs.ReadWrite(value); }); - if (cs.GetMode() == OrcaStream::Mode::reading) + cs.readWriteVector(patrolArea, [&cs](TileCoordsXY& value) { cs.readWrite(value); }); + if (cs.getMode() == OrcaStream::Mode::reading) { if (patrolArea.empty()) { @@ -2517,130 +2517,130 @@ namespace OpenRCT2 return; } - cs.ReadWrite(entity.AssignedStaffType); - cs.ReadWrite(entity.MechanicTimeSinceCall); - cs.ReadWrite(entity.HireDate); + cs.readWrite(entity.AssignedStaffType); + cs.readWrite(entity.MechanicTimeSinceCall); + cs.readWrite(entity.HireDate); if (os.getHeader().targetVersion <= 4) { - cs.Ignore(); + cs.ignore(); } - cs.ReadWrite(entity.StaffOrders); - cs.ReadWrite(entity.StaffMowingTimeout); - cs.ReadWrite(entity.StaffLawnsMown); - cs.ReadWrite(entity.StaffGardensWatered); - cs.ReadWrite(entity.StaffLitterSwept); - cs.ReadWrite(entity.StaffBinsEmptied); + cs.readWrite(entity.StaffOrders); + cs.readWrite(entity.StaffMowingTimeout); + cs.readWrite(entity.StaffLawnsMown); + cs.readWrite(entity.StaffGardensWatered); + cs.readWrite(entity.StaffLitterSwept); + cs.readWrite(entity.StaffBinsEmptied); } template<> void ParkFile::ReadWriteEntity(OrcaStream& os, OrcaStream::ChunkStream& cs, SteamParticle& steamParticle) { ReadWriteEntityCommon(cs, steamParticle); - cs.ReadWrite(steamParticle.time_to_move); - cs.ReadWrite(steamParticle.frame); + cs.readWrite(steamParticle.time_to_move); + cs.readWrite(steamParticle.frame); } template<> void ParkFile::ReadWriteEntity(OrcaStream& os, OrcaStream::ChunkStream& cs, MoneyEffect& moneyEffect) { ReadWriteEntityCommon(cs, moneyEffect); - cs.ReadWrite(moneyEffect.MoveDelay); - cs.ReadWrite(moneyEffect.NumMovements); - cs.ReadWrite(moneyEffect.GuestPurchase); - cs.ReadWrite(moneyEffect.Value); - cs.ReadWrite(moneyEffect.OffsetX); - cs.ReadWrite(moneyEffect.Wiggle); + cs.readWrite(moneyEffect.MoveDelay); + cs.readWrite(moneyEffect.NumMovements); + cs.readWrite(moneyEffect.GuestPurchase); + cs.readWrite(moneyEffect.Value); + cs.readWrite(moneyEffect.OffsetX); + cs.readWrite(moneyEffect.Wiggle); } template<> void ParkFile::ReadWriteEntity(OrcaStream& os, OrcaStream::ChunkStream& cs, VehicleCrashParticle& vehicleCrashParticle) { ReadWriteEntityCommon(cs, vehicleCrashParticle); - cs.ReadWrite(vehicleCrashParticle.frame); - cs.ReadWrite(vehicleCrashParticle.time_to_live); - cs.ReadWrite(vehicleCrashParticle.frame); - cs.ReadWrite(vehicleCrashParticle.colour[0]); - cs.ReadWrite(vehicleCrashParticle.colour[1]); - cs.ReadWrite(vehicleCrashParticle.crashed_sprite_base); - cs.ReadWrite(vehicleCrashParticle.velocity_x); - cs.ReadWrite(vehicleCrashParticle.velocity_y); - cs.ReadWrite(vehicleCrashParticle.velocity_z); - cs.ReadWrite(vehicleCrashParticle.acceleration_x); - cs.ReadWrite(vehicleCrashParticle.acceleration_y); - cs.ReadWrite(vehicleCrashParticle.acceleration_z); + cs.readWrite(vehicleCrashParticle.frame); + cs.readWrite(vehicleCrashParticle.time_to_live); + cs.readWrite(vehicleCrashParticle.frame); + cs.readWrite(vehicleCrashParticle.colour[0]); + cs.readWrite(vehicleCrashParticle.colour[1]); + cs.readWrite(vehicleCrashParticle.crashed_sprite_base); + cs.readWrite(vehicleCrashParticle.velocity_x); + cs.readWrite(vehicleCrashParticle.velocity_y); + cs.readWrite(vehicleCrashParticle.velocity_z); + cs.readWrite(vehicleCrashParticle.acceleration_x); + cs.readWrite(vehicleCrashParticle.acceleration_y); + cs.readWrite(vehicleCrashParticle.acceleration_z); } template<> void ParkFile::ReadWriteEntity(OrcaStream& os, OrcaStream::ChunkStream& cs, ExplosionCloud& entity) { ReadWriteEntityCommon(cs, entity); - cs.ReadWrite(entity.frame); + cs.readWrite(entity.frame); } template<> void ParkFile::ReadWriteEntity(OrcaStream& os, OrcaStream::ChunkStream& cs, CrashSplashParticle& entity) { ReadWriteEntityCommon(cs, entity); - cs.ReadWrite(entity.frame); + cs.readWrite(entity.frame); } template<> void ParkFile::ReadWriteEntity(OrcaStream& os, OrcaStream::ChunkStream& cs, ExplosionFlare& entity) { ReadWriteEntityCommon(cs, entity); - cs.ReadWrite(entity.frame); + cs.readWrite(entity.frame); } template<> void ParkFile::ReadWriteEntity(OrcaStream& os, OrcaStream::ChunkStream& cs, JumpingFountain& fountain) { ReadWriteEntityCommon(cs, fountain); - cs.ReadWrite(fountain.NumTicksAlive); - cs.ReadWrite(fountain.frame); - cs.ReadWrite(fountain.fountainFlags.holder); - cs.ReadWrite(fountain.TargetX); - cs.ReadWrite(fountain.TargetY); - cs.ReadWrite(fountain.TargetY); - cs.ReadWrite(fountain.Iteration); + cs.readWrite(fountain.NumTicksAlive); + cs.readWrite(fountain.frame); + cs.readWrite(fountain.fountainFlags.holder); + cs.readWrite(fountain.TargetX); + cs.readWrite(fountain.TargetY); + cs.readWrite(fountain.TargetY); + cs.readWrite(fountain.Iteration); } template<> void ParkFile::ReadWriteEntity(OrcaStream& os, OrcaStream::ChunkStream& cs, Balloon& balloon) { ReadWriteEntityCommon(cs, balloon); - cs.ReadWrite(balloon.popped); - cs.ReadWrite(balloon.time_to_move); - cs.ReadWrite(balloon.frame); - cs.ReadWrite(balloon.colour); + cs.readWrite(balloon.popped); + cs.readWrite(balloon.time_to_move); + cs.readWrite(balloon.frame); + cs.readWrite(balloon.colour); } template<> void ParkFile::ReadWriteEntity(OrcaStream& os, OrcaStream::ChunkStream& cs, Duck& duck) { ReadWriteEntityCommon(cs, duck); - cs.ReadWrite(duck.frame); - cs.ReadWrite(duck.target_x); - cs.ReadWrite(duck.target_y); - cs.ReadWrite(duck.state); + cs.readWrite(duck.frame); + cs.readWrite(duck.target_x); + cs.readWrite(duck.target_y); + cs.readWrite(duck.state); } template<> void ParkFile::ReadWriteEntity(OrcaStream& os, OrcaStream::ChunkStream& cs, Litter& entity) { ReadWriteEntityCommon(cs, entity); - cs.ReadWrite(entity.SubType); - cs.ReadWrite(entity.creationTick); + cs.readWrite(entity.SubType); + cs.readWrite(entity.creationTick); } template void ParkFile::WriteEntitiesOfType(OrcaStream& os, OrcaStream::ChunkStream& cs) { uint16_t count = GetEntityListCount(T::cEntityType); - cs.Write(T::cEntityType); - cs.Write(count); + cs.write(T::cEntityType); + cs.write(count); for (auto* ent : EntityList()) { - cs.Write(ent->Id); + cs.write(ent->Id); ReadWriteEntity(os, cs, *ent); } } @@ -2654,14 +2654,14 @@ namespace OpenRCT2 template void ParkFile::ReadEntitiesOfType(OrcaStream& os, OrcaStream::ChunkStream& cs) { - [[maybe_unused]] auto t = cs.Read(); + [[maybe_unused]] auto t = cs.read(); assert(t == T::cEntityType); - auto count = cs.Read(); + auto count = cs.read(); for (auto i = 0; i < count; ++i) { T placeholder{}; - auto index = cs.Read(); + auto index = cs.read(); auto* ent = CreateEntityAt(index); if (ent == nullptr) { @@ -2681,13 +2681,13 @@ namespace OpenRCT2 void ParkFile::ReadWriteEntitiesChunk(GameState_t& gameState, OrcaStream& os) { os.readWriteChunk(ParkFileChunkType::ENTITIES, [this, &gameState, &os](OrcaStream::ChunkStream& cs) { - if (cs.GetMode() == OrcaStream::Mode::reading) + if (cs.getMode() == OrcaStream::Mode::reading) { ResetAllEntities(); } std::vector entityIndices; - if (cs.GetMode() == OrcaStream::Mode::reading) + if (cs.getMode() == OrcaStream::Mode::reading) { ReadEntitiesOfTypes< Vehicle, Guest, Staff, Litter, SteamParticle, MoneyEffect, VehicleCrashParticle, ExplosionCloud,