mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 11:33:03 +01:00
Code Issues Releases Wiki Activity

Automatically write array size

Browse Source
This commit is contained in:
Ted John
2018-12-15 10:10:07 +00:00
parent 9919253983
commit 3f663feec7
2 changed files with 38 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/openrct2/ParkFile.cpp
View File

@@ -95,14 +95,41 @@ void ParkFile::EndChunk()
_chunks.push_back(_currentChunk);
}
void ParkFile::BeginArray(size_t count, size_t elementSize)
void ParkFile::BeginArray()
{
WriteValue((uint32_t)count);
WriteValue((uint32_t)elementSize);
_currentArrayCount = 0;
_currentArrayElementSize = 0;
_currentArrayStartPos = _buffer.tellp();
WriteValue<uint32_t>(0);
WriteValue<uint32_t>(0);
_currentArrayLastPos = _buffer.tellp();
}
void ParkFile::NextArrayElement()
{
auto lastElSize = (size_t)_buffer.tellp() - _currentArrayLastPos;
if (_currentArrayCount == 0)
{
// Set array element size based on first element size
_currentArrayElementSize = lastElSize;
}
else if (_currentArrayElementSize != lastElSize)
{
// Array element size was different from first element so reset it
// to dynamic
_currentArrayElementSize = 0;
}
_currentArrayCount++;
_currentArrayLastPos = _buffer.tellp();
}
void ParkFile::EndArray()
{
auto backupPos = _buffer.tellp();
_buffer.seekp(_currentArrayStartPos);
WriteValue((uint32_t)_currentArrayCount);
WriteValue((uint32_t)_currentArrayElementSize);
_buffer.seekp(backupPos);
}
void ParkFile::WriteBuffer(const void* buffer, size_t len)
@@ -138,8 +165,7 @@ void ParkFile::WriteGeneralChunk()
WriteValue(gGuestInitialHunger);
WriteValue(gGuestInitialThirst);
auto numSpawns = (gPeepSpawns[0].isNull() ? 1 : 0) + (gPeepSpawns[1].isNull() ? 1 : 0);
BeginArray(numSpawns, 13);
BeginArray();
for (const auto& spawn : gPeepSpawns)
{
if (!gPeepSpawns->isNull())
@@ -149,6 +175,7 @@ void ParkFile::WriteGeneralChunk()
WriteValue(spawn.z);
WriteValue(spawn.direction);
}
NextArrayElement();
}
EndArray();

7
src/openrct2/ParkFile.h
View File

@@ -37,6 +37,10 @@ namespace OpenRCT2
std::vector<ChunkEntry> _chunks;
std::stringstream _buffer;
ChunkEntry _currentChunk;
std::streampos _currentArrayStartPos;
std::streampos _currentArrayLastPos;
size_t _currentArrayCount;
size_t _currentArrayElementSize;
void WriteHeader(std::ostream& fs);
void BeginChunk(uint32_t id);
@@ -44,7 +48,8 @@ namespace OpenRCT2
void WriteBuffer(const void* buffer, size_t len);
void WriteString(const std::string_view& s);
void BeginArray(size_t count, size_t elementSize);
void BeginArray();
void NextArrayElement();
void EndArray();
template<typename T>