From 6e62186d01f096478c5a44d96e7b30d493951921 Mon Sep 17 00:00:00 2001 From: Hielke Morsink Date: Tue, 2 Oct 2018 21:09:08 +0200 Subject: [PATCH] Fix #8034: screenshot command outputs broken sprites (#8041) Check for no-graphics instead of headless when creating objects. --- distribution/changelog.txt | 1 + src/openrct2/object/ObjectFactory.cpp | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/distribution/changelog.txt b/distribution/changelog.txt index 684e53ee3e..ba9c04a8fe 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -9,6 +9,7 @@ - Fix: [#7828] Copied entrances and exits stay when demolishing ride. - Fix: [#7954] Key validation fails on Windows due to non-ASCII user / player name. - Fix: [#7975] Inspection flag not cleared for rides which are set to never be inspected (Original bug). +- Fix: [#8034] Vanilla sprites are broken when making screenshots from command line. - Improved: [#2940] Allow mouse-dragging to set patrol area (Singleplayer only). - Improved: [#7730] Draw extreme vertical and lateral Gs red in the ride window's graph tab. - Improved: [#7930] Automatically create folders for custom content. diff --git a/src/openrct2/object/ObjectFactory.cpp b/src/openrct2/object/ObjectFactory.cpp index da2a6c2921..4fde964a25 100644 --- a/src/openrct2/object/ObjectFactory.cpp +++ b/src/openrct2/object/ObjectFactory.cpp @@ -212,7 +212,7 @@ namespace ObjectFactory log_verbose(" size: %zu", chunk->GetLength()); auto chunkStream = MemoryStream(chunk->GetData(), chunk->GetLength()); - auto readContext = ReadObjectContext(objectRepository, objectName, !gOpenRCT2Headless, nullptr); + auto readContext = ReadObjectContext(objectRepository, objectName, !gOpenRCT2NoGraphics, nullptr); ReadObjectLegacy(result, &readContext, &chunkStream); if (readContext.WasError()) { @@ -241,7 +241,7 @@ namespace ObjectFactory utf8 objectName[DAT_NAME_LENGTH + 1]; object_entry_get_name_fixed(objectName, sizeof(objectName), entry); - auto readContext = ReadObjectContext(objectRepository, objectName, !gOpenRCT2Headless, nullptr); + auto readContext = ReadObjectContext(objectRepository, objectName, !gOpenRCT2NoGraphics, nullptr); auto chunkStream = MemoryStream(data, dataSize); ReadObjectLegacy(result, &readContext, &chunkStream); @@ -409,7 +409,7 @@ namespace ObjectFactory memcpy(entry.name, originalName.c_str(), minLength); result = CreateObject(entry); - auto readContext = ReadObjectContext(objectRepository, id, !gOpenRCT2Headless, fileRetriever); + auto readContext = ReadObjectContext(objectRepository, id, !gOpenRCT2NoGraphics, fileRetriever); result->ReadJson(&readContext, jRoot); if (readContext.WasError()) {