From 7f4bb206aff57feb7a02bd093d2c39b3203e70eb Mon Sep 17 00:00:00 2001 From: Gymnasiast Date: Fri, 3 Aug 2018 18:37:06 +0200 Subject: [PATCH] Correct identification of 'Utopia Park' Utopia Park is the only scenario in RCT1 that uses different names in the scenario list and for the park. Since we use the former to identify scenarios, correct it. Also add an alias to keep the very popular pack by Crappage working. --- data/language/en-GB.txt | 2 +- src/openrct2/rct1/S4Importer.cpp | 2 +- src/openrct2/scenario/ScenarioSources.cpp | 4 +++- src/openrct2/scenario/ScenarioSources.h | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/data/language/en-GB.txt b/data/language/en-GB.txt index 06ec4a9089..41059bf74d 100644 --- a/data/language/en-GB.txt +++ b/data/language/en-GB.txt @@ -4792,7 +4792,7 @@ STR_DTLS :Build a park to appeal to the high-intensity thrill-seeking local p STR_SCNR :Utopia Park -STR_PARK :Utopia Park +STR_PARK :Utopia STR_DTLS :An oasis in the middle of the desert provides an unusual opportunity to build an amusement park diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index 8e2a906e1b..59c0857d5c 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -2808,7 +2808,7 @@ private: case SC_PACIFIC_PYRAMIDS: FixLandOwnershipTiles({ { 93, 105 }, { 63, 34 }, { 76, 25 }, { 85, 31 }, { 96, 47 }, { 96, 48 } }); break; - case SC_UTOPIA: + case SC_UTOPIA_PARK: FixLandOwnershipTiles({ { 85, 73 } }); break; case SC_URBAN_PARK: diff --git a/src/openrct2/scenario/ScenarioSources.cpp b/src/openrct2/scenario/ScenarioSources.cpp index 4759851067..6ef48f2284 100644 --- a/src/openrct2/scenario/ScenarioSources.cpp +++ b/src/openrct2/scenario/ScenarioSources.cpp @@ -46,6 +46,8 @@ namespace ScenarioSources // RCT1 pack by RCTScenarioLover has a mistake: { "Geoffrey Gardens", "Geoffery Gardens" }, + // RCT1 pack by Crappage uses park name to identify Utopia Park, instead of scenario list name: + { "Utopia Park", "Utopia" }, // CD Projekt Polish Edition { "Alpine Adventures", "Górska przygoda" }, @@ -162,7 +164,7 @@ namespace ScenarioSources { SC_ROMAN_VILLAGE, "Roman Village", SCENARIO_CATEGORY_CHALLENGING }, { SC_SWAMP_COVE, "Swamp Cove", SCENARIO_CATEGORY_CHALLENGING }, { SC_ADRENALINE_HEIGHTS, "Adrenaline Heights", SCENARIO_CATEGORY_CHALLENGING }, - { SC_UTOPIA, "Utopia", SCENARIO_CATEGORY_CHALLENGING }, + { SC_UTOPIA_PARK, "Utopia Park", SCENARIO_CATEGORY_CHALLENGING }, { SC_ROTTING_HEIGHTS, "Rotting Heights", SCENARIO_CATEGORY_EXPERT }, { SC_FIASCO_FOREST, "Fiasco Forest", SCENARIO_CATEGORY_EXPERT }, { SC_PICKLE_PARK, "Pickle Park", SCENARIO_CATEGORY_EXPERT }, diff --git a/src/openrct2/scenario/ScenarioSources.h b/src/openrct2/scenario/ScenarioSources.h index 7a0f597249..31677333ab 100644 --- a/src/openrct2/scenario/ScenarioSources.h +++ b/src/openrct2/scenario/ScenarioSources.h @@ -98,7 +98,7 @@ enum SC_ROMAN_VILLAGE, SC_SWAMP_COVE, SC_ADRENALINE_HEIGHTS, - SC_UTOPIA, + SC_UTOPIA_PARK, SC_ROTTING_HEIGHTS, SC_FIASCO_FOREST, SC_PICKLE_PARK,