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

Fix #21220: Localised park name not used when loading SC4

Browse Source
This commit is contained in:
Michael Steenbeek
2024-02-11 21:51:23 +01:00
committed by GitHub
parent 70b9d0ca47
commit 1a13cdcc57
2 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/changelog.txt
View File

@@ -4,6 +4,7 @@
- Improved: [#21356] Resize the title bar when moving between displays with different scaling factors on Windows systems.
- Fix: [#18963] Research table in parks from Loopy Landscapes is imported incorrectly.
- Fix: [#20907] RCT1/AA scenarios use the 4-across train for the Inverted Roller Coaster.
- Fix: [#21220] When creating a new park from a SC4 file, the localised park name is not applied.
- Fix: [#21330] Tooltips from dropdown widgets have the wrong position.
- Fix: [#21332] Mini Helicopters and Monorail Cycles ride types are swapped in research within RCT1 scenarios.
- Fix: [#21347] Too many options are hidden if the platform has no file picker.

10
src/openrct2/rct1/S4Importer.cpp
View File

@@ -2297,6 +2297,7 @@ namespace RCT1
void ImportScenarioNameDetails(GameState_t& gameState)
{
std::string name = String::ToStd(_s4.ScenarioName);
std::string parkName;
std::string details;
int32_t scNumber = _s4.ScenarioSlotIndex;
@@ -2312,6 +2313,10 @@ namespace RCT1
{
name = String::ToStd(LanguageGetString(localisedStringIds[0]));
}
if (localisedStringIds[1] != STR_NONE)
{
parkName = String::ToStd(LanguageGetString(localisedStringIds[1]));
}
if (localisedStringIds[2] != STR_NONE)
{
details = String::ToStd(LanguageGetString(localisedStringIds[2]));
@@ -2322,6 +2327,11 @@ namespace RCT1
gameState.ScenarioName = std::move(name);
gameState.ScenarioDetails = std::move(details);
if (_isScenario && !parkName.empty())
{
auto& park = GetContext()->GetGameState()->GetPark();
park.Name = std::move(parkName);
}
}
void ImportScenarioObjective(GameState_t& gameState)