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

Do not load images for objects if in headless mode

Browse Source
This commit is contained in:
Ted John
2018-02-10 20:56:36 +00:00
committed by Gymnasiast
parent c465b35037
commit f3c125853b
3 changed files with 27 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/openrct2/object/ObjectJsonHelpers.cpp
View File

@@ -311,7 +311,6 @@ namespace ObjectJsonHelpers
auto rangeStart = name.find('[');
auto imgStart = 0;
auto imgEnd = INT16_MAX;
//auto range = std::vector<sint32>({ 0 });
if (rangeStart != std::string::npos)
{
auto rangeString = name.substr(rangeStart);
@@ -365,15 +364,18 @@ namespace ObjectJsonHelpers
void LoadImages(IReadObjectContext * context, const json_t * root, ImageTable &imageTable)
{
auto jsonImages = json_object_get(root, "images");
auto imageElements = GetJsonStringArray(jsonImages);
for (const auto &ie : imageElements)
if (context->ShouldLoadImages())
{
auto images = ParseImages(context, ie);
for (const auto &g1 : images)
auto jsonImages = json_object_get(root, "images");
auto imageElements = GetJsonStringArray(jsonImages);
for (const auto &ie : imageElements)
{
imageTable.AddImage(&g1);
std::free(g1.offset);
auto images = ParseImages(context, ie);
for (const auto &g1 : images)
{
imageTable.AddImage(&g1);
std::free(g1.offset);
}
}
}
}