mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-26 00:04:43 +01:00
Code Issues Releases Wiki Activity

add better object read error logging

Browse Source
This commit is contained in:
Ted John
2016-07-01 21:01:06 +01:00
parent 6b353346b9
commit 8ce9a66286
29 changed files with 209 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/object/RideObject.cpp
View File

@@ -43,19 +43,19 @@ RideObject::~RideObject()
}
}
void RideObject::ReadLegacy(IStream * stream)
void RideObject::ReadLegacy(IReadObjectContext * context, IStream * stream)
{
stream->Read(&_legacyType);
GetStringTable()->Read(stream, OBJ_STRING_ID_NAME);
GetStringTable()->Read(stream, OBJ_STRING_ID_DESCRIPTION);
GetStringTable()->Read(context, stream, OBJ_STRING_ID_NAME);
GetStringTable()->Read(context, stream, OBJ_STRING_ID_DESCRIPTION);
// TODO: Move to its own function when ride construction window is merged.
if (gConfigInterface.select_by_track_type) {
_legacyType.enabledTrackPieces = 0xFFFFFFFFFFFFFFFF;
}
GetStringTable()->Read(stream, OBJ_STRING_ID_CAPACITY);
GetStringTable()->Read(context, stream, OBJ_STRING_ID_CAPACITY);
// Read preset colours, by default there are 32
_presetColours.count = stream->ReadValue<uint8>();
@@ -79,7 +79,7 @@ void RideObject::ReadLegacy(IStream * stream)
_peepLoadingPositions[i] = stream->ReadArray<sint8>(numPeepLoadingPositions);
}
GetImageTable()->Read(stream);
GetImageTable()->Read(context, stream);
}
void RideObject::Load()