mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-23 06:44:38 +01:00
Code Issues Releases Wiki Activity

Move IStream, MemoryStream, FileStream into OpenRCT2 namespace

Browse Source
This commit is contained in:
Matt
2020-07-30 23:01:22 +02:00
parent 30376085cf
commit 83355e35cc
74 changed files with 828 additions and 758 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/openrct2/object/SmallSceneryObject.cpp
View File

@@ -23,15 +23,15 @@
#include <algorithm>
void SmallSceneryObject::ReadLegacy(IReadObjectContext* context, IStream* stream)
void SmallSceneryObject::ReadLegacy(IReadObjectContext* context, OpenRCT2::IStream* stream)
{
stream->Seek(6, STREAM_SEEK_CURRENT);
stream->Seek(6, OpenRCT2::STREAM_SEEK_CURRENT);
_legacyType.small_scenery.flags = stream->ReadValue<uint32_t>();
_legacyType.small_scenery.height = stream->ReadValue<uint8_t>();
_legacyType.small_scenery.tool_id = stream->ReadValue<uint8_t>();
_legacyType.small_scenery.price = stream->ReadValue<int16_t>();
_legacyType.small_scenery.removal_price = stream->ReadValue<int16_t>();
stream->Seek(4, STREAM_SEEK_CURRENT);
stream->Seek(4, OpenRCT2::STREAM_SEEK_CURRENT);
_legacyType.small_scenery.animation_delay = stream->ReadValue<uint16_t>();
_legacyType.small_scenery.animation_mask = stream->ReadValue<uint16_t>();
_legacyType.small_scenery.num_frames = stream->ReadValue<uint16_t>();
@@ -139,7 +139,7 @@ void SmallSceneryObject::DrawPreview(rct_drawpixelinfo* dpi, int32_t width, int3
}
}
std::vector<uint8_t> SmallSceneryObject::ReadFrameOffsets(IStream* stream)
std::vector<uint8_t> SmallSceneryObject::ReadFrameOffsets(OpenRCT2::IStream* stream)
{
uint8_t frameOffset;
auto data = std::vector<uint8_t>();