mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-21 14:02:59 +01:00
Code Issues Releases Wiki Activity

Rename fields in rct_scenery_group_entry

Browse Source
This commit is contained in:
Ted John
2017-11-22 21:42:41 +00:00
parent 430d95bd95
commit ef65a5208b
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/openrct2-ui/windows/Scenery.cpp
View File

@@ -321,7 +321,7 @@ void window_scenery_init()
continue;
tabIndexes[usedValues] = scenerySetId;
order[usedValues] = sceneryEntry->var_108;
order[usedValues] = sceneryEntry->priority;
usedValues++;
}

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

@@ -33,16 +33,14 @@ void SceneryGroupObject::ReadLegacy(IReadObjectContext * context, IStream * stre
stream->Seek(6, STREAM_SEEK_CURRENT);
stream->Seek(0x80 * 2, STREAM_SEEK_CURRENT);
_legacyType.entry_count = stream->ReadValue<uint8>();
_legacyType.var_107 = stream->ReadValue<uint8>();
_legacyType.var_108 = stream->ReadValue<uint8>();
_legacyType.pad_107 = stream->ReadValue<uint8>();
_legacyType.priority = stream->ReadValue<uint8>();
_legacyType.pad_109 = stream->ReadValue<uint8>();
_legacyType.entertainer_costumes = stream->ReadValue<uint32>();
GetStringTable()->Read(context, stream, OBJ_STRING_ID_NAME);
ReadItems(stream);
GetImageTable()->Read(context, stream);
_legacyType.var_107 = _numItems;
}
void SceneryGroupObject::Load()

4
src/openrct2/world/scenery.h
View File

@@ -201,8 +201,8 @@ typedef struct rct_scenery_group_entry {
uint32 image; // 0x02
uint16 scenery_entries[0x80]; // 0x06
uint8 entry_count; // 0x106
uint8 var_107;
uint8 var_108; // 0x108, order?
uint8 pad_107;
uint8 priority; // 0x108
uint8 pad_109;
uint32 entertainer_costumes; // 0x10A
} rct_scenery_group_entry;