mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add GetImage() method to rct_footpath_entry

This commit is contained in:
Gymnasiast 2021-08-29 16:22:51 +02:00
parent cba52b240e
commit b6b792f874
No known key found for this signature in database
GPG Key ID: DBFFF47AB2CA3EDD
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/openrct2/object/FootpathObject.cpp
View File

@ -42,21 +42,21 @@ void FootpathObject::Load()
_pathSurfaceEntry.string_idx = _legacyType.string_idx;
_pathSurfaceEntry.image = _legacyType.image;
_pathSurfaceEntry.preview = _legacyType.image + 71;
_pathSurfaceEntry.preview = _legacyType.GetPreviewImage();
_pathSurfaceEntry.flags = _legacyType.flags;
_queueEntry.string_idx = _legacyType.string_idx;
_queueEntry.image = _legacyType.image + 51;
_queueEntry.preview = _legacyType.image + 72;
_queueEntry.image = _legacyType.GetQueueImage();
_queueEntry.preview = _legacyType.GetQueuePreviewImage();
_queueEntry.flags = _legacyType.flags | FOOTPATH_ENTRY_FLAG_IS_QUEUE;
_pathRailingsEntry.string_idx = _legacyType.string_idx;
_pathRailingsEntry.bridge_image = _legacyType.bridge_image;
_pathRailingsEntry.preview = _legacyType.image + 71;
_pathRailingsEntry.preview = _legacyType.GetPreviewImage();
_pathRailingsEntry.flags = _legacyType.flags;
_pathRailingsEntry.scrolling_mode = _legacyType.scrolling_mode;
_pathRailingsEntry.support_type = _legacyType.support_type;
_pathRailingsEntry.railings_image = _legacyType.image + 73;
_pathRailingsEntry.railings_image = _legacyType.GetRailingsImage();
}
void FootpathObject::Unload()

17
src/openrct2/world/Footpath.h
View File

@ -49,6 +49,23 @@ struct rct_footpath_entry
RailingEntrySupportType support_type; // 0x0A
uint8_t flags; // 0x0B
uint8_t scrolling_mode; // 0x0C
constexpr uint32_t GetQueueImage() const
{
return image + 51;
}
constexpr uint32_t GetPreviewImage() const
{
return image + 71;
}
constexpr uint32_t GetQueuePreviewImage() const
{
return image + 72;
}
constexpr uint32_t GetRailingsImage() const
{
return image + 73;
}
};
assert_struct_size(rct_footpath_entry, 13);
#pragma pack(pop)