mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 12:33:17 +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/ObjectFactory.cpp
View File

@@ -179,7 +179,7 @@ namespace ObjectFactory
return (result != LookupTable.end()) ? result->second : OBJECT_SOURCE_CUSTOM;
}
static void ReadObjectLegacy(Object* object, IReadObjectContext* context, IStream* stream)
static void ReadObjectLegacy(Object* object, IReadObjectContext* context, OpenRCT2::IStream* stream)
{
try
{
@@ -203,7 +203,7 @@ namespace ObjectFactory
Object* result = nullptr;
try
{
auto fs = FileStream(path, FILE_MODE_OPEN);
auto fs = OpenRCT2::FileStream(path, OpenRCT2::FILE_MODE_OPEN);
auto chunkReader = SawyerChunkReader(&fs);
rct_object_entry entry = fs.ReadValue<rct_object_entry>();
@@ -219,7 +219,7 @@ namespace ObjectFactory
auto chunk = chunkReader.ReadChunk();
log_verbose(" size: %zu", chunk->GetLength());
auto chunkStream = MemoryStream(chunk->GetData(), chunk->GetLength());
auto chunkStream = OpenRCT2::MemoryStream(chunk->GetData(), chunk->GetLength());
auto readContext = ReadObjectContext(objectRepository, objectName, !gOpenRCT2NoGraphics, nullptr);
ReadObjectLegacy(result, &readContext, &chunkStream);
if (readContext.WasError())
@@ -251,7 +251,7 @@ namespace ObjectFactory
object_entry_get_name_fixed(objectName, sizeof(objectName), entry);
auto readContext = ReadObjectContext(objectRepository, objectName, !gOpenRCT2NoGraphics, nullptr);
auto chunkStream = MemoryStream(data, dataSize);
auto chunkStream = OpenRCT2::MemoryStream(data, dataSize);
ReadObjectLegacy(result, &readContext, &chunkStream);
if (readContext.WasError())