mirrors
/
OpenRCT2
mirror of https://github.com/OpenRCT2/OpenRCT2.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix #8875: RCT1 competition scenarios are classified incorrectly (#10548)

This commit is contained in:
Michael Steenbeek 2020-01-12 14:29:02 +01:00 committed by GitHub
parent d7f23bc5bf
commit 3fc5f75eb8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 38 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
distribution/changelog.txt
View File

@ -6,6 +6,7 @@
- Change: [#1164] Use available translations for shortcut key bindings.
- Fix: [#5249] No collision detection when building ride entrance at heights > 85.5m.
- Fix: [#7784] Vehicle tab takes 1st car colour instead of tab_vehicle's colour.
- Fix: [#8875] RCT1 competition scenarios are classified incorrectly.
- Fix: [#10228] Can't import RCT1 Deluxe from Steam.
- Fix: [#10313] Path furniture can be placed on level crossings.
- Fix: [#10325] Crash when banners have no text.

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

@ -288,19 +288,30 @@ namespace ScenarioSources
// Other parks
static constexpr const ScenarioTitleDescriptor ScenarioTitlesOtherParks[] =
{
{ SC_FORT_ANACHRONISM, "Fort Anachronism", SCENARIO_CATEGORY_DLC },
{ SC_PCPLAYER, "PC Player", SCENARIO_CATEGORY_DLC },
{ SC_PCGW, "PC Gaming World", SCENARIO_CATEGORY_DLC },
{ SC_GAMEPLAY, "gameplay", SCENARIO_CATEGORY_DLC },
{ SC_UNIDENTIFIED, "Panda World", SCENARIO_CATEGORY_DLC },
{ SC_UNIDENTIFIED, "Competition Land 1", SCENARIO_CATEGORY_DLC },
{ SC_UNIDENTIFIED, "Competition Land 2", SCENARIO_CATEGORY_DLC },
{ SC_UNIDENTIFIED, "Build your own Six Flags Belgium", SCENARIO_CATEGORY_BUILD_YOUR_OWN },
{ SC_UNIDENTIFIED, "Build your own Six Flags Great Adventure", SCENARIO_CATEGORY_BUILD_YOUR_OWN },
{ SC_UNIDENTIFIED, "Build your own Six Flags Holland", SCENARIO_CATEGORY_BUILD_YOUR_OWN },
{ SC_UNIDENTIFIED, "Build your own Six Flags Magic Mountain", SCENARIO_CATEGORY_BUILD_YOUR_OWN },
{ SC_UNIDENTIFIED, "Build your own Six Flags Park", SCENARIO_CATEGORY_BUILD_YOUR_OWN },
{ SC_UNIDENTIFIED, "Build your own Six Flags over Texas", SCENARIO_CATEGORY_BUILD_YOUR_OWN },
{ SC_FORT_ANACHRONISM, "Fort Anachronism", SCENARIO_CATEGORY_DLC },
{ SC_PCPLAYER, "PC Player", SCENARIO_CATEGORY_DLC },
{ SC_PCGW, "PC Gaming World", SCENARIO_CATEGORY_DLC },
{ SC_GAMEPLAY, "gameplay", SCENARIO_CATEGORY_DLC },
{ SC_UNIDENTIFIED, "Panda World", SCENARIO_CATEGORY_DLC },
{ SC_UNIDENTIFIED, "Competition Land 1", SCENARIO_CATEGORY_DLC },
{ SC_UNIDENTIFIED, "Competition Land 2", SCENARIO_CATEGORY_DLC },
{ SC_STEEL_TWISTER_COMPETITION, "Steel Twister Roller Coaster Competition", SCENARIO_CATEGORY_DLC },
{ SC_GO_KARTS_COMPETITION, "Go Karts Competition", SCENARIO_CATEGORY_DLC },
{ SC_STEEL_CORKSCREW_COMPETITION, "Steel Corkscrew Roller Coaster Competition", SCENARIO_CATEGORY_DLC },
{ SC_MINE_TRAIN_COMPETITION, "Mine Train Roller Coaster Competition", SCENARIO_CATEGORY_DLC },
{ SC_STEEL_ROLLER_COASTER_COMPETITION, "Steel Roller Coaster Competition", SCENARIO_CATEGORY_DLC },
{ SC_BOBSLED_COMPETITION, "Bobsled Roller Coaster Competition", SCENARIO_CATEGORY_DLC },
{ SC_INVERTED_ROLLER_COASTER_COMPETITION, "Inverted Roller Coaster Competition", SCENARIO_CATEGORY_DLC },
{ SC_SUSPENDED_ROLLER_COASTER_COMPETITION, "Suspended Roller Coaster Competition", SCENARIO_CATEGORY_DLC },
{ SC_STAND_UP_STEEL_ROLLER_COASTER_COMPETITION, "Stand-Up Steel Roller Coaster Competition", SCENARIO_CATEGORY_DLC },
{ SC_WOODEN_ROLLER_COASTER_COMPETITION, "Wooden Roller Coaster Competition", SCENARIO_CATEGORY_DLC },
{ SC_STEEL_MINI_ROLLER_COASTER_COMPETITION, "Steel Mini Roller Coaster Competition", SCENARIO_CATEGORY_DLC },
{ SC_UNIDENTIFIED, "Build your own Six Flags Belgium", SCENARIO_CATEGORY_BUILD_YOUR_OWN },
{ SC_UNIDENTIFIED, "Build your own Six Flags Great Adventure", SCENARIO_CATEGORY_BUILD_YOUR_OWN },
{ SC_UNIDENTIFIED, "Build your own Six Flags Holland", SCENARIO_CATEGORY_BUILD_YOUR_OWN },
{ SC_UNIDENTIFIED, "Build your own Six Flags Magic Mountain", SCENARIO_CATEGORY_BUILD_YOUR_OWN },
{ SC_UNIDENTIFIED, "Build your own Six Flags Park", SCENARIO_CATEGORY_BUILD_YOUR_OWN },
{ SC_UNIDENTIFIED, "Build your own Six Flags over Texas", SCENARIO_CATEGORY_BUILD_YOUR_OWN },
};
#define DEFINE_SCENARIO_TITLE_DESC_GROUP(x) { std::size(x), x }

13
src/openrct2/scenario/ScenarioSources.h
View File

@ -132,4 +132,17 @@ enum
SC_MEGAWORLD_PARK,
SC_VENUS_PONDS,
SC_MICRO_PARK,
// Competition scenarios (Build the best ... you can)
SC_STEEL_TWISTER_COMPETITION = 110,
SC_GO_KARTS_COMPETITION = 114,
SC_STEEL_CORKSCREW_COMPETITION = 116,
SC_MINE_TRAIN_COMPETITION = 117,
SC_STEEL_ROLLER_COASTER_COMPETITION = 119,
SC_BOBSLED_COMPETITION = 120,
SC_INVERTED_ROLLER_COASTER_COMPETITION = 123,
SC_SUSPENDED_ROLLER_COASTER_COMPETITION = 124,
SC_STAND_UP_STEEL_ROLLER_COASTER_COMPETITION = 125,
SC_WOODEN_ROLLER_COASTER_COMPETITION = 126,
SC_STEEL_MINI_ROLLER_COASTER_COMPETITION = 127,
};