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

Make terminology use more consistent

Browse Source
This commit is contained in:
Michael Steenbeek
2017-11-20 10:15:52 +01:00
parent 38024bbd0d
commit bf69b2e682
38 changed files with 158 additions and 158 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -135,7 +135,7 @@ protected:
}
stream->WriteValue<uint8>(item.RideGroupIndex);
break;
case OBJECT_TYPE_SCENERY_SETS:
case OBJECT_TYPE_SCENERY_GROUP:
stream->WriteValue<uint16>(item.NumThemeObjects);
for (uint16 i = 0; i < item.NumThemeObjects; i++)
{
@@ -166,7 +166,7 @@ protected:
}
item.RideGroupIndex = stream->ReadValue<uint8>();
break;
case OBJECT_TYPE_SCENERY_SETS:
case OBJECT_TYPE_SCENERY_GROUP:
item.NumThemeObjects = stream->ReadValue<uint16>();
item.ThemeObjects = Memory::AllocateArray<rct_object_entry>(item.NumThemeObjects);
for (uint16 i = 0; i < item.NumThemeObjects; i++)
@@ -436,7 +436,7 @@ private:
uint8 objectType = item->ObjectEntry.flags & 0x0F;
switch (objectType) {
case OBJECT_TYPE_SCENERY_SETS:
case OBJECT_TYPE_SCENERY_GROUP:
Memory::Free(item->ThemeObjects);
item->ThemeObjects = nullptr;
break;