mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-28 17:24:47 +01:00
Code Issues Releases Wiki Activity

Fix GCC by not naming field same as type

Browse Source
This commit is contained in:
Ted John
2016-06-26 21:20:32 +01:00
parent 50b7e4222f
commit 1af6242381
12 changed files with 63 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/object/SmallSceneryObject.cpp
View File

@@ -50,7 +50,7 @@ void SmallSceneryObject::ReadLegacy(IStream * stream)
_legacyType.small_scenery.var_18 = stream->ReadValue<uint16>();
_legacyType.small_scenery.scenery_tab_id = 0xFF;
StringTable.Read(stream, OBJ_STRING_ID_NAME);
GetStringTable().Read(stream, OBJ_STRING_ID_NAME);
_sceneryTabEntry = stream->ReadValue<rct_object_entry>();
@@ -59,13 +59,13 @@ void SmallSceneryObject::ReadLegacy(IStream * stream)
_var10data = ReadVar10(stream);
}
ImageTable.Read(stream);
GetImageTable().Read(stream);
}
void SmallSceneryObject::Load()
{
_legacyType.name = language_allocate_object_string(GetName());
_legacyType.image = gfx_object_allocate_images(ImageTable.GetImages(), ImageTable.GetCount());
_legacyType.image = gfx_object_allocate_images(GetImageTable().GetImages(), GetImageTable().GetCount());
_legacyType.small_scenery.scenery_tab_id = 0xFF;
if ((_sceneryTabEntry.flags & 0xFF) != 0xFF)
@@ -86,12 +86,12 @@ void SmallSceneryObject::Load()
void SmallSceneryObject::Unload()
{
language_free_object_string(_legacyType.name);
gfx_object_free_images(_legacyType.image, ImageTable.GetCount());
gfx_object_free_images(_legacyType.image, GetImageTable().GetCount());
}
const utf8 * SmallSceneryObject::GetName()
{
return StringTable.GetString(OBJ_STRING_ID_NAME);
return GetStringTable().GetString(OBJ_STRING_ID_NAME);
}
uint8 * SmallSceneryObject::ReadVar10(IStream * stream)