diff --git a/distribution/changelog.txt b/distribution/changelog.txt index e3a175196c..90d8c19242 100644 --- a/distribution/changelog.txt +++ b/distribution/changelog.txt @@ -17,6 +17,7 @@ - Change: [#24418] Small & Large Zero G Rolls can now be built on the LIM Launched RC without cheats if vehicle sprites are available. - Fix: [#5269] Font bugs when using the Russian release of RCT2 as the base game. - Fix: [#11071, #22958] The virtual floor does not always draw correctly. +- Fix: [#18220] Some custom RCT1 scenarios are detected as competition DLC scenarios. - Fix: [#20158] Custom animated scenery .DATs with frame offsets draw a random sprite at the end of their animation. - Fix: [#23289] Dodgems and Flying Saucer cars can spawn on top of each other when the ride is opened. - Fix: [#24332] Banner font renders differently when using RCT Classic as the base game. diff --git a/src/openrct2/rct1/S4Importer.cpp b/src/openrct2/rct1/S4Importer.cpp index e9b45383e9..f64053999c 100644 --- a/src/openrct2/rct1/S4Importer.cpp +++ b/src/openrct2/rct1/S4Importer.cpp @@ -233,6 +233,10 @@ namespace OpenRCT2::RCT1 // If no entry is found, this is a custom scenario. bool isOfficial = ScenarioSources::TryGetById(_s4.ScenarioSlotIndex, &desc); + // Perform an additional name check if this is detected to be a competition scenario + if (isOfficial && desc.category == ScenarioCategory::competitions) + isOfficial = ScenarioSources::TryGetByName(_s4.ScenarioName, &desc); + dst->Category = desc.category; dst->SourceGame = ScenarioSource{ desc.source }; dst->SourceIndex = desc.index; diff --git a/src/openrct2/scenario/ScenarioSources.cpp b/src/openrct2/scenario/ScenarioSources.cpp index 67f2309810..c71b47014c 100644 --- a/src/openrct2/scenario/ScenarioSources.cpp +++ b/src/openrct2/scenario/ScenarioSources.cpp @@ -334,7 +334,7 @@ namespace OpenRCT2::ScenarioSources { SC_MINE_TRAIN_COMPETITION, "Mine Train Roller Coaster Competition", ScenarioCategory::competitions, {} }, { SC_STAND_UP_STEEL_ROLLER_COASTER_COMPETITION, "Stand-Up Steel Roller Coaster Competition", ScenarioCategory::competitions, {} }, { SC_STEEL_CORKSCREW_COMPETITION, "Steel Corkscrew Roller Coaster Competition", ScenarioCategory::competitions, {} }, - { SC_STEEL_MINI_ROLLER_COASTER_COMPETITION, "Steel Mini Roller Coaster Competition", ScenarioCategory::competitions, {} }, + { SC_STEEL_MINI_ROLLER_COASTER_COMPETITION, "Steel Mini-Roller Coaster Competition", ScenarioCategory::competitions, {} }, { SC_STEEL_ROLLER_COASTER_COMPETITION, "Steel Roller Coaster Competition", ScenarioCategory::competitions, {} }, { SC_STEEL_TWISTER_COMPETITION, "Steel Twister Roller Coaster Competition", ScenarioCategory::competitions, {} }, { SC_SUSPENDED_ROLLER_COASTER_COMPETITION, "Suspended Roller Coaster Competition", ScenarioCategory::competitions, {} },