mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-27 16:54:52 +01:00
Code Issues Releases Wiki Activity

Perform an additional name check for competition scenarios (#24518)

Browse Source
This commit is contained in:
Aaron van Geffen
2025-05-27 22:14:54 +02:00
committed by GitHub
parent 594ecf54ac
commit a7b12594c8
3 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/changelog.txt
View File

@@ -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.

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

@@ -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;

2
src/openrct2/scenario/ScenarioSources.cpp
View File

@@ -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, {} },