From 66d67e2ee6fa87b9ef4d64bbfbab8f4da3be4177 Mon Sep 17 00:00:00 2001 From: Aaron van Geffen Date: Fri, 16 May 2025 13:02:36 +0200 Subject: [PATCH] Populate image table for scenario meta objects --- src/openrct2/object/ScenarioMetaObject.cpp | 16 ++++++++++++++++ src/openrct2/object/ScenarioMetaObject.h | 6 ++++++ 2 files changed, 22 insertions(+) diff --git a/src/openrct2/object/ScenarioMetaObject.cpp b/src/openrct2/object/ScenarioMetaObject.cpp index 560b206264..20f5075ab6 100644 --- a/src/openrct2/object/ScenarioMetaObject.cpp +++ b/src/openrct2/object/ScenarioMetaObject.cpp @@ -18,10 +18,16 @@ using namespace OpenRCT2; void ScenarioMetaObject::Load() { + auto numImages = GetImageTable().GetCount(); + if (numImages == 0) + return; + + _imageOffsetId = LoadImages(); } void ScenarioMetaObject::Unload() { + UnloadImages(); } void ScenarioMetaObject::ReadJson(IReadObjectContext* context, json_t& root) @@ -44,3 +50,13 @@ std::string ScenarioMetaObject::GetScenarioDetails() { return GetStringTable().GetString(ObjectStringID::SCENARIO_DETAILS); } + +ImageIndex ScenarioMetaObject::GetMiniMapImageIndex() const +{ + return _imageOffsetId; +} + +ImageIndex ScenarioMetaObject::GetPreviewImageIndex() const +{ + return _imageOffsetId + 1; +} diff --git a/src/openrct2/object/ScenarioMetaObject.h b/src/openrct2/object/ScenarioMetaObject.h index 4452d6099a..fbea3b41d9 100644 --- a/src/openrct2/object/ScenarioMetaObject.h +++ b/src/openrct2/object/ScenarioMetaObject.h @@ -16,6 +16,9 @@ class ScenarioMetaObject final : public Object { +private: + ImageIndex _imageOffsetId; + public: static constexpr ObjectType kObjectType = ObjectType::scenarioMeta; @@ -26,4 +29,7 @@ public: std::string GetScenarioName(); std::string GetParkName(); std::string GetScenarioDetails(); + + ImageIndex GetMiniMapImageIndex() const; + ImageIndex GetPreviewImageIndex() const; };