diff --git a/src/openrct2/object/FootpathObject.cpp b/src/openrct2/object/FootpathObject.cpp index 6de138b344..827c3527c9 100644 --- a/src/openrct2/object/FootpathObject.cpp +++ b/src/openrct2/object/FootpathObject.cpp @@ -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() diff --git a/src/openrct2/world/Footpath.h b/src/openrct2/world/Footpath.h index 3f45837433..532b40f95f 100644 --- a/src/openrct2/world/Footpath.h +++ b/src/openrct2/world/Footpath.h @@ -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)