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

Use object_entry_get_type() throughout

Browse Source
This commit is contained in:
Michael Steenbeek
2018-02-13 15:20:55 +01:00
parent 3ea6a3ea2f
commit a408747c4c
5 changed files with 23 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -122,7 +122,7 @@ protected:
stream->WriteString(item.Path);
stream->WriteString(item.Name);
switch (item.ObjectEntry.flags & 0x0F) {
switch (object_entry_get_type(&item.ObjectEntry)) {
case OBJECT_TYPE_RIDE:
stream->WriteValue<uint8>(item.RideFlags);
for (sint32 i = 0; i < MAX_CATEGORIES_PER_RIDE; i++)
@@ -153,7 +153,7 @@ protected:
item.Path = stream->ReadString();
item.Name = stream->ReadString();
switch (item.ObjectEntry.flags & 0x0F) {
switch (object_entry_get_type(&item.ObjectEntry)) {
case OBJECT_TYPE_RIDE:
item.RideFlags = stream->ReadValue<uint8>();
for (sint32 i = 0; i < 2; i++)
@@ -434,7 +434,7 @@ private:
item->Path = nullptr;
item->Name = nullptr;
uint8 objectType = item->ObjectEntry.flags & 0x0F;
uint8 objectType = object_entry_get_type(&item->ObjectEntry);
switch (objectType) {
case OBJECT_TYPE_SCENERY_GROUP:
Memory::Free(item->ThemeObjects);