mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-15 11:03:00 +01:00
Code Issues Releases Wiki Activity

Load placeholder empty images if CSG not linked (#16071)

Browse Source
This commit is contained in:
Duncan
2021-11-30 13:27:16 +00:00
committed by GitHub
parent c58f96c029
commit 60ef13ed0c
1 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/openrct2/object/ImageTable.cpp
View File

@@ -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"))