From 60ef13ed0c21ced42affa4da4188ea4119bb2390 Mon Sep 17 00:00:00 2001
From: Duncan <duncans_pumpkin@hotmail.co.uk>
Date: Tue, 30 Nov 2021 13:27:16 +0000
Subject: [PATCH] Load placeholder empty images if CSG not linked (#16071)

---
 src/openrct2/object/ImageTable.cpp | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/src/openrct2/object/ImageTable.cpp b/src/openrct2/object/ImageTable.cpp
index cf821576e6..92f0f06276 100644
--- a/src/openrct2/object/ImageTable.cpp
+++ b/src/openrct2/object/ImageTable.cpp
@@ -89,10 +89,10 @@ std::vector<std::unique_ptr<ImageTable::RequiredImage>> ImageTable::ParseImages(
     }
     else if (String::StartsWith(s, "$CSG"))
     {
-        if (is_csg_loaded())
+        auto range = ParseRange(s.substr(4));
+        if (!range.empty())
         {
-            auto range = ParseRange(s.substr(4));
-            if (!range.empty())
+            if (is_csg_loaded())
             {
                 for (auto i : range)
                 {
@@ -101,6 +101,16 @@ std::vector<std::unique_ptr<ImageTable::RequiredImage>> ImageTable::ParseImages(
                         [](uint32_t idx) -> const rct_g1_element* { return gfx_get_g1_element(idx); }));
                 }
             }
+            else
+            {
+                std::string id(context->GetObjectIdentifier());
+                log_warning("CSG not loaded inserting placeholder images for %s", id.c_str());
+                result.resize(range.size());
+                for (auto& res : result)
+                {
+                    res = std::make_unique<RequiredImage>();
+                }
+            }
         }
     }
     else if (String::StartsWith(s, "$G1"))