mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Rename methods

This commit is contained in:
Ted John 2018-12-30 02:05:29 +00:00
parent d1185dc73e
commit c4b32adada
2 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/openrct2/ParkFile.cpp
View File

@ -91,20 +91,20 @@ namespace OpenRCT2
{ {
_os = std::make_unique<OrcaStream>(path, OrcaStream::Mode::READING); _os = std::make_unique<OrcaStream>(path, OrcaStream::Mode::READING);
RequiredObjects.clear(); RequiredObjects.clear();
WriteObjectsChunk(*_os); ReadWriteObjectsChunk(*_os);
} }
void Import() void Import()
{ {
auto& os = *_os; auto& os = *_os;
WriteTilesChunk(os); ReadWriteTilesChunk(os);
WriteScenarioChunk(os); ReadWriteScenarioChunk(os);
WriteGeneralChunk(os); ReadWriteGeneralChunk(os);
WriteParkChunk(os); ReadWriteParkChunk(os);
WriteClimateChunk(os); ReadWriteClimateChunk(os);
WriteResearch(os); ReadWriteResearchChunk(os);
WriteNotifications(os); ReadWriteNotificationsChunk(os);
WriteInterfaceChunk(os); ReadWriteInterfaceChunk(os);
// Initial cash will eventually be removed // Initial cash will eventually be removed
gInitialCash = gCash; gInitialCash = gCash;
@ -121,20 +121,20 @@ namespace OpenRCT2
header.TargetVersion = PARK_FILE_CURRENT_VERSION; header.TargetVersion = PARK_FILE_CURRENT_VERSION;
header.MinVersion = PARK_FILE_MIN_VERSION; header.MinVersion = PARK_FILE_MIN_VERSION;
WriteAuthoringChunk(os); ReadWriteAuthoringChunk(os);
WriteObjectsChunk(os); ReadWriteObjectsChunk(os);
WriteTilesChunk(os); ReadWriteTilesChunk(os);
WriteScenarioChunk(os); ReadWriteScenarioChunk(os);
WriteGeneralChunk(os); ReadWriteGeneralChunk(os);
WriteParkChunk(os); ReadWriteParkChunk(os);
WriteClimateChunk(os); ReadWriteClimateChunk(os);
WriteResearch(os); ReadWriteResearchChunk(os);
WriteNotifications(os); ReadWriteNotificationsChunk(os);
WriteInterfaceChunk(os); ReadWriteInterfaceChunk(os);
} }
private: private:
void WriteAuthoringChunk(OrcaStream& os) void ReadWriteAuthoringChunk(OrcaStream& os)
{ {
// Write-only for now // Write-only for now
if (os.GetMode() == OrcaStream::Mode::WRITING) if (os.GetMode() == OrcaStream::Mode::WRITING)
@ -150,7 +150,7 @@ namespace OpenRCT2
} }
} }
void WriteObjectsChunk(OrcaStream& os) void ReadWriteObjectsChunk(OrcaStream& os)
{ {
if (os.GetMode() == OrcaStream::Mode::READING) if (os.GetMode() == OrcaStream::Mode::READING)
{ {
@ -195,7 +195,7 @@ namespace OpenRCT2
} }
} }
void WriteScenarioChunk(OrcaStream& os) void ReadWriteScenarioChunk(OrcaStream& os)
{ {
os.ReadWriteChunk(ParkFileChunkType::SCENARIO, [](OrcaStream::ChunkStream& cs) { os.ReadWriteChunk(ParkFileChunkType::SCENARIO, [](OrcaStream::ChunkStream& cs) {
cs.ReadWriteAs<uint8_t, uint32_t>(gS6Info.category); cs.ReadWriteAs<uint8_t, uint32_t>(gS6Info.category);
@ -232,7 +232,7 @@ namespace OpenRCT2
}); });
} }
void WriteGeneralChunk(OrcaStream& os) void ReadWriteGeneralChunk(OrcaStream& os)
{ {
auto found = os.ReadWriteChunk(ParkFileChunkType::GENERAL, [](OrcaStream::ChunkStream& cs) { auto found = os.ReadWriteChunk(ParkFileChunkType::GENERAL, [](OrcaStream::ChunkStream& cs) {
cs.ReadWriteAs<uint32_t, uint64_t>(gScenarioTicks); cs.ReadWriteAs<uint32_t, uint64_t>(gScenarioTicks);
@ -262,7 +262,7 @@ namespace OpenRCT2
} }
} }
void WriteInterfaceChunk(OrcaStream& os) void ReadWriteInterfaceChunk(OrcaStream& os)
{ {
os.ReadWriteChunk(ParkFileChunkType::INTERFACE, [](OrcaStream::ChunkStream& cs) { os.ReadWriteChunk(ParkFileChunkType::INTERFACE, [](OrcaStream::ChunkStream& cs) {
cs.ReadWrite(gSavedViewX); cs.ReadWrite(gSavedViewX);
@ -273,7 +273,7 @@ namespace OpenRCT2
}); });
} }
void WriteClimateChunk(OrcaStream& os) void ReadWriteClimateChunk(OrcaStream& os)
{ {
os.ReadWriteChunk(ParkFileChunkType::CLIMATE, [](OrcaStream::ChunkStream& cs) { os.ReadWriteChunk(ParkFileChunkType::CLIMATE, [](OrcaStream::ChunkStream& cs) {
cs.ReadWrite(gClimate); cs.ReadWrite(gClimate);
@ -290,7 +290,7 @@ namespace OpenRCT2
}); });
} }
void WriteParkChunk(OrcaStream& os) void ReadWriteParkChunk(OrcaStream& os)
{ {
os.ReadWriteChunk(ParkFileChunkType::PARK, [](OrcaStream::ChunkStream& cs) { os.ReadWriteChunk(ParkFileChunkType::PARK, [](OrcaStream::ChunkStream& cs) {
cs.ReadWrite(gParkNameArgs); cs.ReadWrite(gParkNameArgs);
@ -361,7 +361,7 @@ namespace OpenRCT2
}); });
} }
void WriteResearch(OrcaStream& os) void ReadWriteResearchChunk(OrcaStream& os)
{ {
os.ReadWriteChunk(ParkFileChunkType::RESEARCH, [](OrcaStream::ChunkStream& cs) { os.ReadWriteChunk(ParkFileChunkType::RESEARCH, [](OrcaStream::ChunkStream& cs) {
// Research status // Research status
@ -381,7 +381,7 @@ namespace OpenRCT2
}); });
} }
void WriteNotifications(OrcaStream& os) void ReadWriteNotificationsChunk(OrcaStream& os)
{ {
os.ReadWriteChunk(ParkFileChunkType::NOTIFICATIONS, [](OrcaStream::ChunkStream& cs) { os.ReadWriteChunk(ParkFileChunkType::NOTIFICATIONS, [](OrcaStream::ChunkStream& cs) {
std::vector<NewsItem> notifications(std::begin(gNewsItems), std::end(gNewsItems)); std::vector<NewsItem> notifications(std::begin(gNewsItems), std::end(gNewsItems));
@ -420,7 +420,7 @@ namespace OpenRCT2
}); });
} }
void WriteDerivedChunk(OrcaStream& os) void ReadWriteDerivedChunk(OrcaStream& os)
{ {
if (os.GetMode() == OrcaStream::Mode::WRITING) if (os.GetMode() == OrcaStream::Mode::WRITING)
{ {
@ -435,7 +435,7 @@ namespace OpenRCT2
} }
} }
void WriteTilesChunk(OrcaStream& os) void ReadWriteTilesChunk(OrcaStream& os)
{ {
auto found = os.ReadWriteChunk(ParkFileChunkType::TILES, [](OrcaStream::ChunkStream& cs) { auto found = os.ReadWriteChunk(ParkFileChunkType::TILES, [](OrcaStream::ChunkStream& cs) {
cs.ReadWriteAs<int16_t, uint32_t>(gMapSize); // x cs.ReadWriteAs<int16_t, uint32_t>(gMapSize); // x

4
src/openrct2/config/Config.cpp
View File

@ -475,7 +475,7 @@ namespace Config
} }
} }
static void WriteNotifications(IIniWriter* writer) static void ReadWriteNotificationsChunk(IIniWriter* writer)
{ {
auto model = &gConfigNotifications; auto model = &gConfigNotifications;
writer->WriteSection("notifications"); writer->WriteSection("notifications");
@ -613,7 +613,7 @@ namespace Config
WriteInterface(writer.get()); WriteInterface(writer.get());
WriteSound(writer.get()); WriteSound(writer.get());
WriteNetwork(writer.get()); WriteNetwork(writer.get());
WriteNotifications(writer.get()); ReadWriteNotificationsChunk(writer.get());
WriteFont(writer.get()); WriteFont(writer.get());
WritePlugin(writer.get()); WritePlugin(writer.get());
return true; return true;