mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-16 19:43:06 +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

4
src/openrct2/object/ObjectRepository.cpp
View File

@@ -611,7 +611,7 @@ private:
return String::Convert(normalisedName, CODE_PAGE::CP_1252, CODE_PAGE::CP_UTF8);
}
void WritePackedObject(IStream* stream, const rct_object_entry* entry)
void WritePackedObject(OpenRCT2::IStream* stream, const rct_object_entry* entry)
{
const ObjectRepositoryItem* item = FindObject(entry);
if (item == nullptr)
@@ -620,7 +620,7 @@ private:
}
// Read object data from file
auto fs = FileStream(item->Path, FILE_MODE_OPEN);
auto fs = OpenRCT2::FileStream(item->Path, OpenRCT2::FILE_MODE_OPEN);
auto fileEntry = fs.ReadValue<rct_object_entry>();
if (!object_entry_compare(entry, &fileEntry))
{