mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-18 04:23:20 +01:00
Code Issues Releases Wiki Activity

Fix Scenario description missing when loading a park from a save file

Browse Source 
Saved games do not have a valid info chunk,
so scenario names/descriptions did not load.
This commit is contained in:
Silent
2021-10-03 20:57:17 +02:00
committed by GitHub
parent dc44d1f79d
commit 445fb747bf
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/openrct2/rct2/S6Importer.cpp
View File

@@ -212,15 +212,20 @@ public:
gScenarioCategory = static_cast<SCENARIO_CATEGORY>(_s6.info.category);
// Some scenarios have their scenario details in UTF-8, due to earlier bugs in OpenRCT2.
if (!IsLikelyUTF8(_s6.info.name) && !IsLikelyUTF8(_s6.info.details))
auto loadMaybeUTF8 = [](std::string_view str) -> std::string {
return !IsLikelyUTF8(str) ? rct2_to_utf8(str, RCT2LanguageId::EnglishUK) : std::string(str);
};
if (_s6.header.type == S6_TYPE_SCENARIO)
{
gScenarioName = rct2_to_utf8(_s6.info.name, RCT2LanguageId::EnglishUK);
gScenarioDetails = rct2_to_utf8(_s6.info.details, RCT2LanguageId::EnglishUK);
gScenarioName = loadMaybeUTF8(_s6.info.name);
gScenarioDetails = loadMaybeUTF8(_s6.info.details);
}
else
{
gScenarioName = _s6.info.name;
gScenarioDetails = _s6.info.details;
// Saved games do not have an info chunk
gScenarioName = loadMaybeUTF8(_s6.scenario_name);
gScenarioDetails = loadMaybeUTF8(_s6.scenario_description);
}
gDateMonthsElapsed = static_cast<int32_t>(_s6.elapsed_months);