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

Use more consistent terminology and remove some Americanisms

This commit is contained in:
Michael Steenbeek 2017-12-05 10:23:36 +01:00
parent 10a4dd06b0
commit 0ffa2b541a
26 changed files with 131 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenRCT2.xcodeproj/project.pbxproj
View File

@ -100,7 +100,7 @@
4C93F19B1F8B748200A9330D /* MiniatureRailway.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C93F1961F8B748200A9330D /* MiniatureRailway.cpp */; };
4C93F19C1F8B748200A9330D /* Monorail.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C93F1971F8B748200A9330D /* Monorail.cpp */; };
4C93F19D1F8B748200A9330D /* SuspendedMonorail.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C93F1981F8B748200A9330D /* SuspendedMonorail.cpp */; };
4C93F1A51F8B748900A9330D /* BoatRide.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C93F19E1F8B748900A9330D /* BoatRide.cpp */; };
4C93F1A51F8B748900A9330D /* BoatHire.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C93F19E1F8B748900A9330D /* BoatHire.cpp */; };
4C93F1A61F8B748900A9330D /* DingySlide.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C93F19F1F8B748900A9330D /* DingySlide.cpp */; };
4C93F1A71F8B748900A9330D /* LogFlume.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C93F1A01F8B748900A9330D /* LogFlume.cpp */; };
4C93F1A81F8B748900A9330D /* RiverRapids.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4C93F1A11F8B748900A9330D /* RiverRapids.cpp */; };
@ -686,7 +686,7 @@
4C93F1961F8B748200A9330D /* MiniatureRailway.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = MiniatureRailway.cpp; sourceTree = "<group>"; };
4C93F1971F8B748200A9330D /* Monorail.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Monorail.cpp; sourceTree = "<group>"; };
4C93F1981F8B748200A9330D /* SuspendedMonorail.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = SuspendedMonorail.cpp; sourceTree = "<group>"; };
4C93F19E1F8B748900A9330D /* BoatRide.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BoatRide.cpp; sourceTree = "<group>"; };
4C93F19E1F8B748900A9330D /* BoatHire.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BoatHire.cpp; sourceTree = "<group>"; };
4C93F19F1F8B748900A9330D /* DingySlide.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = DingySlide.cpp; sourceTree = "<group>"; };
4C93F1A01F8B748900A9330D /* LogFlume.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LogFlume.cpp; sourceTree = "<group>"; };
4C93F1A11F8B748900A9330D /* RiverRapids.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = RiverRapids.cpp; sourceTree = "<group>"; };
@ -2394,7 +2394,7 @@
F76C84EA1EC4E7CD00FA49E2 /* water */ = {
isa = PBXGroup;
children = (
4C93F19E1F8B748900A9330D /* BoatRide.cpp */,
4C93F19E1F8B748900A9330D /* BoatHire.cpp */,
4C93F19F1F8B748900A9330D /* DingySlide.cpp */,
4C93F1A01F8B748900A9330D /* LogFlume.cpp */,
4C93F1A11F8B748900A9330D /* RiverRapids.cpp */,
@ -3071,7 +3071,7 @@
C685E5191F8907850090598F /* NewRide.cpp in Sources */,
4C93F1561F8B744400A9330D /* VirginiaReel.cpp in Sources */,
C654DF361F69C0430040F43D /* Player.cpp in Sources */,
4C93F1A51F8B748900A9330D /* BoatRide.cpp in Sources */,
4C93F1A51F8B748900A9330D /* BoatHire.cpp in Sources */,
4CFE4E821F90A3F1005243C2 /* Staff.cpp in Sources */,
F76C88791EC5324E00FA49E2 /* AudioContext.cpp in Sources */,
4C93F1571F8B744400A9330D /* WildMouse.cpp in Sources */,

2
data/language/en-GB.txt
View File

@ -11,7 +11,7 @@ STR_0006 :Junior Roller Coaster
STR_0007 :Miniature Railway
STR_0008 :Monorail
STR_0009 :Mini Suspended Coaster
STR_0010 :Boat Ride
STR_0010 :Boat Hire
STR_0011 :Wooden Wild Mouse
STR_0012 :Steeplechase
STR_0013 :Car Ride

2
distribution/changelog.txt
View File

@ -387,7 +387,7 @@ This is the first fully implemented version of OpenRCT2. RCT2.EXE is no longer r
- Fix: [#2681] When lowering/raising land/water with clearance checks off, walls still get removed.
- Fix: [#2693] Multiplayer chat caret does not show true position.
- Fix: [#2704] OSX Command Key not read for keyboard shortcuts.
- Fix: [#2728] Closing a boat ride with passengers causes empty boats to leave the platform (original bug).
- Fix: [#2728] Closing a boat Hire with passengers causes empty boats to leave the platform (original bug).
- Fix: [#2925] Screenshots don't show night filters.
- Fix: [#2941] Enter does not work on input box when on the title screen.
- Fix: [#2948] New Ride window incorrectly said there were track designs available when in multiplayer mode.

2
src/openrct2-ui/windows/Map.cpp
View File

@ -1491,7 +1491,7 @@ static const uint8 RideColourKey[] = {
COLOUR_KEY_RIDE, // RIDE_TYPE_MINIATURE_RAILWAY
COLOUR_KEY_RIDE, // RIDE_TYPE_MONORAIL
COLOUR_KEY_RIDE, // RIDE_TYPE_MINI_SUSPENDED_COASTER
COLOUR_KEY_RIDE, // RIDE_TYPE_BOAT_RIDE
COLOUR_KEY_RIDE, // RIDE_TYPE_BOAT_HIRE
COLOUR_KEY_RIDE, // RIDE_TYPE_WOODEN_WILD_MOUSE
COLOUR_KEY_RIDE, // RIDE_TYPE_STEEPLECHASE
COLOUR_KEY_RIDE, // RIDE_TYPE_CAR_RIDE

2
src/openrct2-ui/windows/NewRide.cpp
View File

@ -129,7 +129,7 @@ const char RideTypeViewOrder[] = {
RIDE_TYPE_RIVER_RAPIDS,
RIDE_TYPE_SPLASH_BOATS,
RIDE_TYPE_SUBMARINE_RIDE,
RIDE_TYPE_BOAT_RIDE,
RIDE_TYPE_BOAT_HIRE,
RIDE_TYPE_RIVER_RAFTS,
RIDE_TYPE_WATER_COASTER,

2
src/openrct2-ui/windows/Ride.cpp
View File

@ -1122,7 +1122,7 @@ static const window_ride_colour_preview TrackColourPreviews[] = {
{ SPR_RIDE_DESIGN_PREVIEW_MINIATURE_RAILWAY_TRACK, SPR_RIDE_DESIGN_PREVIEW_MINIATURE_RAILWAY_SUPPORTS},
{ SPR_RIDE_DESIGN_PREVIEW_MONORAIL_TRACK, SPR_RIDE_DESIGN_PREVIEW_MONORAIL_SUPPORTS},
{ SPR_RIDE_DESIGN_PREVIEW_MINI_SUSPENDED_COASTER_TRACK, SPR_RIDE_DESIGN_PREVIEW_MINI_SUSPENDED_COASTER_SUPPORTS},
{ SPR_RIDE_DESIGN_PREVIEW_BOAT_RIDE_TRACK, SPR_RIDE_DESIGN_PREVIEW_BOAT_RIDE_SUPPORTS},
{ SPR_RIDE_DESIGN_PREVIEW_BOAT_HIRE_TRACK, SPR_RIDE_DESIGN_PREVIEW_BOAT_HIRE_SUPPORTS},
{ SPR_RIDE_DESIGN_PREVIEW_WOODEN_WILD_MOUSE_TRACK, SPR_RIDE_DESIGN_PREVIEW_WOODEN_WILD_MOUSE_SUPPORTS},
{ SPR_RIDE_DESIGN_PREVIEW_STEEPLECHASE_TRACK, SPR_RIDE_DESIGN_PREVIEW_STEEPLECHASE_SUPPORTS},
{ SPR_RIDE_DESIGN_PREVIEW_CAR_RIDE_TRACK, SPR_RIDE_DESIGN_PREVIEW_CAR_RIDE_SUPPORTS},

2
src/openrct2/drawing/lightfx.c
View File

@ -749,7 +749,7 @@ void lightfx_add_lights_magic_vehicles()
case RIDE_TYPE_CHAIRLIFT:
lightfx_add_3d_light(vehicleID, 0x0000 | LIGHTFX_LIGHT_QUALIFIER_SPRITE, place_x, place_y, place_z - 16, LIGHTFX_LIGHT_TYPE_LANTERN_2);
break;
case RIDE_TYPE_BOAT_RIDE:
case RIDE_TYPE_BOAT_HIRE:
case RIDE_TYPE_CAR_RIDE:
case RIDE_TYPE_GO_KARTS:
case RIDE_TYPE_DODGEMS:

4
src/openrct2/localisation/localisation.c
View File

@ -155,7 +155,7 @@ const rct_string_id PeepThoughts[] = {
STR_PEEP_THOUGHT_TYPE_HOT_DOG,
STR_PEEP_THOUGHT_TYPE_TENTACLE,
STR_PEEP_THOUGHT_TYPE_HAT,
STR_PEEP_THOUGHT_TYPE_CANDY_APPLE,
STR_PEEP_THOUGHT_TYPE_TOFFEE_APPLE,
STR_PEEP_THOUGHT_TYPE_TSHIRT,
STR_PEEP_THOUGHT_TYPE_DONUT,
STR_PEEP_THOUGHT_TYPE_COFFEE,
@ -189,7 +189,7 @@ const rct_string_id PeepThoughts[] = {
STR_PEEP_THOUGHT_TYPE_HOT_DOG_MUCH,
STR_PEEP_THOUGHT_TYPE_TENTACLE_MUCH,
STR_PEEP_THOUGHT_TYPE_HAT_MUCH,
STR_PEEP_THOUGHT_TYPE_CANDY_APPLE_MUCH,
STR_PEEP_THOUGHT_TYPE_TOFFEE_APPLE_MUCH,
STR_PEEP_THOUGHT_TYPE_TSHIRT_MUCH,
STR_PEEP_THOUGHT_TYPE_DONUT_MUCH,
STR_PEEP_THOUGHT_TYPE_COFFEE_MUCH,

8
src/openrct2/localisation/string_ids.h
View File

@ -33,7 +33,7 @@ enum {
STR_RIDE_NAME_MINIATURE_RAILWAY = 7,
STR_RIDE_NAME_MONORAIL = 8,
STR_RIDE_NAME_MINI_SUSPENDED_COASTER = 9,
STR_RIDE_NAME_BOAT_RIDE = 10,
STR_RIDE_NAME_BOAT_HIRE = 10,
STR_RIDE_NAME_WOODEN_WILD_MOUSE = 11,
STR_RIDE_NAME_STEEPLECHASE = 12,
STR_RIDE_NAME_CAR_RIDE = 13,
@ -125,7 +125,7 @@ enum {
STR_RIDE_DESCRIPTION_MINIATURE_RAILWAY = 517,
STR_RIDE_DESCRIPTION_MONORAIL = 518,
STR_RIDE_DESCRIPTION_MINI_SUSPENDED_COASTER = 519,
STR_RIDE_DESCRIPTION_BOAT_RIDE = 520,
STR_RIDE_DESCRIPTION_BOAT_HIRE = 520,
STR_RIDE_DESCRIPTION_WOODEN_WILD_MOUSE = 521,
STR_RIDE_DESCRIPTION_STEEPLECHASE = 522,
STR_RIDE_DESCRIPTION_CAR_RIDE = 523,
@ -967,7 +967,7 @@ enum {
STR_PEEP_THOUGHT_TYPE_HOT_DOG = 1534,
STR_PEEP_THOUGHT_TYPE_TENTACLE = 1535,
STR_PEEP_THOUGHT_TYPE_HAT = 1536,
STR_PEEP_THOUGHT_TYPE_CANDY_APPLE = 1537,
STR_PEEP_THOUGHT_TYPE_TOFFEE_APPLE = 1537,
STR_PEEP_THOUGHT_TYPE_TSHIRT = 1538,
STR_PEEP_THOUGHT_TYPE_DONUT = 1539,
STR_PEEP_THOUGHT_TYPE_COFFEE = 1540,
@ -1001,7 +1001,7 @@ enum {
STR_PEEP_THOUGHT_TYPE_HOT_DOG_MUCH = 1568,
STR_PEEP_THOUGHT_TYPE_TENTACLE_MUCH = 1569,
STR_PEEP_THOUGHT_TYPE_HAT_MUCH = 1570,
STR_PEEP_THOUGHT_TYPE_CANDY_APPLE_MUCH = 1571,
STR_PEEP_THOUGHT_TYPE_TOFFEE_APPLE_MUCH = 1571,
STR_PEEP_THOUGHT_TYPE_TSHIRT_MUCH = 1572,
STR_PEEP_THOUGHT_TYPE_DONUT_MUCH = 1573,
STR_PEEP_THOUGHT_TYPE_COFFEE_MUCH = 1574,

10
src/openrct2/peep/Peep.cpp
View File

@ -820,7 +820,7 @@ static const uint8 byte_9822F4[] = {
133, // SHOP_ITEM_HOT_DOG
110, // SHOP_ITEM_TENTACLE
0, // SHOP_ITEM_HAT
50, // SHOP_ITEM_CANDY_APPLE
50, // SHOP_ITEM_TOFFEE_APPLE
0, // SHOP_ITEM_TSHIRT
80, // SHOP_ITEM_DONUT
90, // SHOP_ITEM_COFFEE
@ -898,7 +898,7 @@ static const uint8 peep_item_containers[] = {
0xFF, // PEEP_ITEM_HOT_DOG
0xFF, // PEEP_ITEM_TENTACLE
0xFF, // PEEP_ITEM_HAT
0xFF, // PEEP_ITEM_CANDY_APPLE
0xFF, // PEEP_ITEM_TOFFEE_APPLE
0xFF, // PEEP_ITEM_TSHIRT
0xFF, // PEEP_ITEM_DONUT
SHOP_ITEM_EMPTY_CUP, // PEEP_ITEM_COFFEE
@ -1854,7 +1854,7 @@ static item_pref_t item_order_preference[] = {
{ 0, PEEP_ITEM_POPCORN, PEEP_SPRITE_TYPE_PIZZA },
{ 0, PEEP_ITEM_HOT_DOG, PEEP_SPRITE_TYPE_HOT_DOG },
{ 0, PEEP_ITEM_TENTACLE, PEEP_SPRITE_TYPE_TENTACLE },
{ 0, PEEP_ITEM_CANDY_APPLE, PEEP_SPRITE_TYPE_TOFFEE_APPLE },
{ 0, PEEP_ITEM_TOFFEE_APPLE, PEEP_SPRITE_TYPE_TOFFEE_APPLE },
{ 0, PEEP_ITEM_DONUT, PEEP_SPRITE_TYPE_DONUT },
{ 1, PEEP_ITEM_PRETZEL, PEEP_SPRITE_TYPE_PRETZEL },
{ 1, PEEP_ITEM_COOKIE, PEEP_SPRITE_TYPE_PRETZEL },
@ -6313,7 +6313,7 @@ static const uint8 item_standard_litter[32] = {
LITTER_TYPE_RUBBISH, // PEEP_ITEM_HOT_DOG
LITTER_TYPE_RUBBISH, // PEEP_ITEM_TENTACLE
LITTER_TYPE_RUBBISH, // PEEP_ITEM_HAT
LITTER_TYPE_RUBBISH, // PEEP_ITEM_CANDY_APPLE
LITTER_TYPE_RUBBISH, // PEEP_ITEM_TOFFEE_APPLE
LITTER_TYPE_RUBBISH, // PEEP_ITEM_TSHIRT
LITTER_TYPE_RUBBISH, // PEEP_ITEM_DONUT
LITTER_TYPE_RUBBISH, // PEEP_ITEM_COFFEE
@ -8451,7 +8451,7 @@ static sint32 peep_has_food_standard_flag(rct_peep * peep)
{
return peep->item_standard_flags &
(PEEP_ITEM_DRINK | PEEP_ITEM_BURGER | PEEP_ITEM_CHIPS | PEEP_ITEM_ICE_CREAM | PEEP_ITEM_CANDYFLOSS |
PEEP_ITEM_PIZZA | PEEP_ITEM_POPCORN | PEEP_ITEM_HOT_DOG | PEEP_ITEM_TENTACLE | PEEP_ITEM_CANDY_APPLE |
PEEP_ITEM_PIZZA | PEEP_ITEM_POPCORN | PEEP_ITEM_HOT_DOG | PEEP_ITEM_TENTACLE | PEEP_ITEM_TOFFEE_APPLE |
PEEP_ITEM_DONUT | PEEP_ITEM_COFFEE | PEEP_ITEM_CHICKEN | PEEP_ITEM_LEMONADE);
}

6
src/openrct2/peep/Peep.h
View File

@ -99,7 +99,7 @@ enum PEEP_THOUGHT_TYPE
PEEP_THOUGHT_TYPE_HOT_DOG = 54,
PEEP_THOUGHT_TYPE_TENTACLE = 55,
PEEP_THOUGHT_TYPE_HAT = 56,
PEEP_THOUGHT_TYPE_CANDY_APPLE = 57,
PEEP_THOUGHT_TYPE_TOFFEE_APPLE = 57,
PEEP_THOUGHT_TYPE_TSHIRT = 58,
PEEP_THOUGHT_TYPE_DONUT = 59,
PEEP_THOUGHT_TYPE_COFFEE = 60,
@ -128,7 +128,7 @@ enum PEEP_THOUGHT_TYPE
PEEP_THOUGHT_TYPE_HOT_DOG_MUCH = 88,
PEEP_THOUGHT_TYPE_TENTACLE_MUCH = 89,
PEEP_THOUGHT_TYPE_HAT_MUCH = 90,
PEEP_THOUGHT_TYPE_CANDY_APPLE_MUCH = 91,
PEEP_THOUGHT_TYPE_TOFFEE_APPLE_MUCH = 91,
PEEP_THOUGHT_TYPE_TSHIRT_MUCH = 92,
PEEP_THOUGHT_TYPE_DONUT_MUCH = 93,
PEEP_THOUGHT_TYPE_COFFEE_MUCH = 94,
@ -361,7 +361,7 @@ enum PEEP_ITEM
PEEP_ITEM_HOT_DOG = (1 << 16),
PEEP_ITEM_TENTACLE = (1 << 17),
PEEP_ITEM_HAT = (1 << 18),
PEEP_ITEM_CANDY_APPLE = (1 << 19),
PEEP_ITEM_TOFFEE_APPLE = (1 << 19),
PEEP_ITEM_TSHIRT = (1 << 20),
PEEP_ITEM_DONUT = (1 << 21),
PEEP_ITEM_COFFEE = (1 << 22),

8
src/openrct2/rct1.h
View File

@ -812,7 +812,7 @@ enum {
RCT1_RIDE_TYPE_SUSPENDED_ROLLER_COASTER,
RCT1_RIDE_TYPE_INVERTED_ROLLER_COASTER,
RCT1_RIDE_TYPE_STEEL_MINI_ROLLER_COASTER,
RCT1_RIDE_TYPE_MINIATURE_RAILROAD,
RCT1_RIDE_TYPE_MINIATURE_RAILWAY,
RCT1_RIDE_TYPE_MONORAIL,
RCT1_RIDE_TYPE_SUSPENDED_SINGLE_RAIL_ROLLER_COASTER,
RCT1_RIDE_TYPE_BOAT_HIRE,
@ -847,13 +847,13 @@ enum {
RCT1_RIDE_TYPE_FERRIS_WHEEL,
RCT1_RIDE_TYPE_MOTION_SIMULATOR,
RCT1_RIDE_TYPE_3D_CINEMA,
RCT1_RIDE_TYPE_GRAVITRON,
RCT1_RIDE_TYPE_TOP_SPIN,
RCT1_RIDE_TYPE_SPACE_RINGS,
RCT1_RIDE_TYPE_REVERSE_FREEFALL_ROLLER_COASTER,
RCT1_RIDE_TYPE_SOUVENIR_STALL,
RCT1_RIDE_TYPE_VERTICAL_ROLLER_COASTER,
RCT1_RIDE_TYPE_PIZZA_STALL,
RCT1_RIDE_TYPE_SCRAMBLED_EGGS,
RCT1_RIDE_TYPE_TWIST,
RCT1_RIDE_TYPE_HAUNTED_HOUSE,
RCT1_RIDE_TYPE_POPCORN_STALL,
RCT1_RIDE_TYPE_CIRCUS_SHOW,
@ -865,7 +865,7 @@ enum {
RCT1_RIDE_TYPE_HOT_DOG_STALL,
RCT1_RIDE_TYPE_EXOTIC_SEA_FOOD_STALL,
RCT1_RIDE_TYPE_HAT_STALL,
RCT1_RIDE_TYPE_CANDY_APPLE_STAND,
RCT1_RIDE_TYPE_TOFFEE_APPLE_STALL,
RCT1_RIDE_TYPE_VIRGINIA_REEL,
RCT1_RIDE_TYPE_RIVER_RIDE,
RCT1_RIDE_TYPE_CYCLE_MONORAIL,

14
src/openrct2/rct1/Tables.cpp
View File

@ -180,7 +180,7 @@ namespace RCT1
RIDE_TYPE_MINIATURE_RAILWAY,
RIDE_TYPE_MONORAIL,
RIDE_TYPE_MINI_SUSPENDED_COASTER,
RIDE_TYPE_BOAT_RIDE,
RIDE_TYPE_BOAT_HIRE,
RIDE_TYPE_WOODEN_WILD_MOUSE,
RIDE_TYPE_STEEPLECHASE,
RIDE_TYPE_CAR_RIDE,
@ -249,7 +249,7 @@ namespace RCT1
RIDE_TYPE_WATER_COASTER,
RIDE_TYPE_AIR_POWERED_VERTICAL_COASTER,
RIDE_TYPE_INVERTED_HAIRPIN_COASTER,
RIDE_TYPE_BOAT_RIDE,
RIDE_TYPE_BOAT_HIRE,
RIDE_TYPE_SHOP,
RIDE_TYPE_RIVER_RAFTS,
RIDE_TYPE_FOOD_STALL,
@ -381,7 +381,7 @@ namespace RCT1
case RCT1_RIDE_TYPE_HOT_DOG_STALL:
case RCT1_RIDE_TYPE_EXOTIC_SEA_FOOD_STALL:
case RCT1_RIDE_TYPE_HAT_STALL:
case RCT1_RIDE_TYPE_CANDY_APPLE_STAND:
case RCT1_RIDE_TYPE_TOFFEE_APPLE_STALL:
case RCT1_RIDE_TYPE_40:
case RCT1_RIDE_TYPE_44:
case RCT1_RIDE_TYPE_T_SHIRT_STALL:
@ -693,7 +693,7 @@ namespace RCT1
"ARRSW1 ", // RCT1_RIDE_TYPE_SUSPENDED_ROLLER_COASTER
"NEMT ", // RCT1_RIDE_TYPE_INVERTED_ROLLER_COASTER
"ZLDB ", // RCT1_RIDE_TYPE_STEEL_MINI_ROLLER_COASTER
"NRL ", // RCT1_RIDE_TYPE_MINIATURE_RAILROAD
"NRL ", // RCT1_RIDE_TYPE_MINIATURE_RAILWAY
"MONO2 ", // RCT1_RIDE_TYPE_MONORAIL
"BATFL ", // RCT1_RIDE_TYPE_SUSPENDED_SINGLE_RAIL_ROLLER_COASTER
"RBOAT ", // RCT1_RIDE_TYPE_BOAT_HIRE
@ -728,13 +728,13 @@ namespace RCT1
"FWH1 ", // RCT1_RIDE_TYPE_FERRIS_WHEEL
"SIMPOD ", // RCT1_RIDE_TYPE_MOTION_SIMULATOR
"C3D ", // RCT1_RIDE_TYPE_3D_CINEMA
"TOPSP1 ", // RCT1_RIDE_TYPE_GRAVITRON
"TOPSP1 ", // RCT1_RIDE_TYPE_TOP_SPIN
"SRINGS ", // RCT1_RIDE_TYPE_SPACE_RINGS
"REVF1 ", // RCT1_RIDE_TYPE_REVERSE_FREEFALL_ROLLER_COASTER
"SOUVS ", // RCT1_RIDE_TYPE_SOUVENIR_STALL
"BMVD ", // RCT1_RIDE_TYPE_VERTICAL_ROLLER_COASTER
"PIZZS ", // RCT1_RIDE_TYPE_PIZZA_STALL
"TWIST1 ", // RCT1_RIDE_TYPE_SCRAMBLED_EGGS
"TWIST1 ", // RCT1_RIDE_TYPE_TWIST
"HHBUILD ", // RCT1_RIDE_TYPE_HAUNTED_HOUSE
"POPCS ", // RCT1_RIDE_TYPE_POPCORN_STALL
"CIRCUS1 ", // RCT1_RIDE_TYPE_CIRCUS_SHOW
@ -746,7 +746,7 @@ namespace RCT1
"HOTDS ", // RCT1_RIDE_TYPE_HOT_DOG_STALL
"SQDST ", // RCT1_RIDE_TYPE_EXOTIC_SEA_FOOD_STALL
"HATST ", // RCT1_RIDE_TYPE_HAT_STALL
"TOFFS ", // RCT1_RIDE_TYPE_CANDY_APPLE_STAND
"TOFFS ", // RCT1_RIDE_TYPE_TOFFEE_APPLE_STALL
"VREEL ", // RCT1_RIDE_TYPE_VIRGINIA_REEL
"SPBOAT ", // RCT1_RIDE_TYPE_RIVER_RIDE
"MONBK ", // RCT1_RIDE_TYPE_CYCLE_MONORAIL

6
src/openrct2/ride/RideGroupManager.cpp
View File

@ -227,7 +227,7 @@ const std::vector<const char *> RideGroupManager::GetPreferredRideEntryOrder(con
{ "NRL ", "NRL2 ", "AML1 ", "TRAM1 " }, // RIDE_TYPE_MINIATURE_RAILWAY
{ "MONO1 ", "MONO2 ", "MONO3 " }, // RIDE_TYPE_MONORAIL
{ "BATFL ", "SKYTR "}, // RIDE_TYPE_MINI_SUSPENDED_COASTER
{ "RBOAT ", "BBOAT ", "CBOAT ", "SWANS ", "TRIKE ", "JSKI " }, // RIDE_TYPE_BOAT_RIDE
{ "RBOAT ", "BBOAT ", "CBOAT ", "SWANS ", "TRIKE ", "JSKI " }, // RIDE_TYPE_BOAT_HIRE
{ "WMOUSE ", "WMMINE "}, // RIDE_TYPE_WOODEN_WILD_MOUSE
{ "STEEP1 ", "STEEP2 ", "SBOX " }, // RIDE_TYPE_STEEPLECHASE
{ "SPCAR ", "RCR ", "TRUCK1 ", "VCR ", "CTCAR " }, // RIDE_TYPE_CAR_RIDE
@ -387,10 +387,10 @@ const uint8 gRideCategories[] = {
RIDE_CATEGORY_ROLLERCOASTER, // Suspended Swinging
RIDE_CATEGORY_ROLLERCOASTER, // Inverted
RIDE_CATEGORY_ROLLERCOASTER, // Steel Mini Coaster
RIDE_CATEGORY_TRANSPORT, // Mini Railroad
RIDE_CATEGORY_TRANSPORT, // Mini Railway
RIDE_CATEGORY_TRANSPORT, // Monorail
RIDE_CATEGORY_ROLLERCOASTER, // Mini Suspended Coaster
RIDE_CATEGORY_WATER, // Boat ride
RIDE_CATEGORY_WATER, // Boat Hire
RIDE_CATEGORY_ROLLERCOASTER, // Wooden Wild Mine/Mouse
RIDE_CATEGORY_ROLLERCOASTER, // Steeplechase/Motorbike/Soap Box Derby
RIDE_CATEGORY_GENTLE, // Car Ride

4
src/openrct2/ride/TrackData.cpp
View File

@ -1064,7 +1064,7 @@ const uint64 RideTypePossibleTrackConfigurations[RIDE_TYPE_COUNT] = {
/* RIDE_TYPE_MINIATURE_RAILWAY */ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_S_BEND) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_CURVE),
/* RIDE_TYPE_MONORAIL */ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_S_BEND) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_CURVE),
/* RIDE_TYPE_MINI_SUSPENDED_COASTER */ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_LIFT_HILL) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_S_BEND) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_CURVE),
/* RIDE_TYPE_BOAT_RIDE */ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_CURVE_VERY_SMALL),
/* RIDE_TYPE_BOAT_HIRE */ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_CURVE_VERY_SMALL),
/* RIDE_TYPE_WOODEN_WILD_MOUSE */ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_LIFT_HILL) | (1ULL << TRACK_LIFT_HILL_STEEP) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_SLOPE_STEEP) | (1ULL << TRACK_SLOPE_LONG) | (1ULL << TRACK_CURVE_VERY_SMALL) | (1ULL << TRACK_CURVE_SMALL),
/* RIDE_TYPE_STEEPLECHASE */ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_LIFT_HILL) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_S_BEND) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_CURVE) | (1ULL << TRACK_BRAKES) | (1ULL << TRACK_BLOCK_BRAKES),
/* RIDE_TYPE_CAR_RIDE */ (1ULL << TRACK_STRAIGHT) | (1ULL << TRACK_STATION_END) | (1ULL << TRACK_SLOPE) | (1ULL << TRACK_SLOPE_STEEP) | (1ULL << TRACK_CURVE_VERY_SMALL) | (1ULL << TRACK_CURVE_SMALL) | (1ULL << TRACK_SPINNING_TUNNEL) | (1ULL << TRACK_RAPIDS),
@ -6255,7 +6255,7 @@ const TRACK_PAINT_FUNCTION_GETTER RideTypeTrackPaintFunctions[RIDE_TYPE_COUNT] =
get_track_paint_function_miniature_railway, // RIDE_TYPE_MINIATURE_RAILWAY
get_track_paint_function_monorail, // RIDE_TYPE_MONORAIL
get_track_paint_function_mini_suspended_rc, // RIDE_TYPE_MINI_SUSPENDED_COASTER
get_track_paint_function_boat_ride, // RIDE_TYPE_BOAT_RIDE
get_track_paint_function_boat_hire, // RIDE_TYPE_BOAT_HIRE
get_track_paint_function_wooden_wild_mouse, // RIDE_TYPE_WOODEN_WILD_MOUSE
get_track_paint_function_steeplechase, // RIDE_TYPE_STEEPLECHASE
get_track_paint_function_car_ride, // RIDE_TYPE_CAR_RIDE

4
src/openrct2/ride/TrackDataOld.cpp
View File

@ -2097,7 +2097,7 @@ static const uint32 _OldMiniSuspendedCoasterTrackPaintFunctions[256] = {
};
/** rct2: 0x008B0D60 */
static const uint32 _OldBoatRideTrackPaintFunctions[256] = {
static const uint32 _OldBoatHireTrackPaintFunctions[256] = {
0x008B0E40, // TRACK_ELEM_FLAT
0x008B0E50, // TRACK_ELEM_END_STATION
0x008B0E60, // TRACK_ELEM_BEGIN_STATION
@ -19275,7 +19275,7 @@ const uint32 * RideTypeTrackPaintFunctionsOld[RIDE_TYPE_COUNT] = {
_OldMiniatureRailwayTrackPaintFunctions, // RIDE_TYPE_MINIATURE_RAILWAY
_OldMonorailTrackPaintFunctions, // RIDE_TYPE_MONORAIL
_OldMiniSuspendedCoasterTrackPaintFunctions, // RIDE_TYPE_MINI_SUSPENDED_COASTER
_OldBoatRideTrackPaintFunctions, // RIDE_TYPE_BOAT_RIDE
_OldBoatHireTrackPaintFunctions, // RIDE_TYPE_BOAT_HIRE
_OldWoodenWildMouseTrackPaintFunctions, // RIDE_TYPE_WOODEN_WILD_MOUSE
_OldSteeplechaseTrackPaintFunctions, // RIDE_TYPE_STEEPLECHASE
_OldCarRideTrackPaintFunctions, // RIDE_TYPE_CAR_RIDE

6
src/openrct2/ride/Vehicle.cpp
View File

@ -2149,8 +2149,8 @@ static void train_ready_to_depart(rct_vehicle * vehicle, uint8 num_peeps_on_trai
if (!(ride->lifecycle_flags & RIDE_LIFECYCLE_BROKEN_DOWN))
{
// Original code did not check if the ride was a boat hire, causing empty boats to leave the platform when closing a
// Boat Ride with passengers on it.
if (ride->status != RIDE_STATUS_CLOSED || (ride->num_riders != 0 && ride->type != RIDE_TYPE_BOAT_RIDE))
// Boat Hire with passengers on it.
if (ride->status != RIDE_STATUS_CLOSED || (ride->num_riders != 0 && ride->type != RIDE_TYPE_BOAT_HIRE))
{
ride->train_at_station[vehicle->current_station] = 0xFF;
vehicle->sub_state = 2;
@ -3489,7 +3489,7 @@ static void vehicle_check_if_missing(rct_vehicle * vehicle)
if (ride->lifecycle_flags & RIDE_LIFECYCLE_HAS_STALLED_VEHICLE)
return;
uint16 limit = ride->type == RIDE_TYPE_BOAT_RIDE ? 15360 : 9600;
uint16 limit = ride->type == RIDE_TYPE_BOAT_HIRE ? 15360 : 9600;
if (vehicle->lost_time_out <= limit)
return;

8
src/openrct2/ride/ride.c
View File

@ -4502,7 +4502,7 @@ static void ride_set_start_finish_points(sint32 rideIndex, rct_xy_element *start
Ride *ride = get_ride(rideIndex);
switch (ride->type) {
case RIDE_TYPE_BOAT_RIDE:
case RIDE_TYPE_BOAT_HIRE:
ride_set_boat_hire_return_point(ride, startElement);
break;
case RIDE_TYPE_MAZE:
@ -7714,7 +7714,7 @@ bool shop_item_is_food_or_drink(sint32 shopItem)
case SHOP_ITEM_POPCORN:
case SHOP_ITEM_HOT_DOG:
case SHOP_ITEM_TENTACLE:
case SHOP_ITEM_CANDY_APPLE:
case SHOP_ITEM_TOFFEE_APPLE:
case SHOP_ITEM_DONUT:
case SHOP_ITEM_COFFEE:
case SHOP_ITEM_CHICKEN:
@ -7750,7 +7750,7 @@ bool shop_item_is_food(sint32 shopItem)
case SHOP_ITEM_POPCORN:
case SHOP_ITEM_HOT_DOG:
case SHOP_ITEM_TENTACLE:
case SHOP_ITEM_CANDY_APPLE:
case SHOP_ITEM_TOFFEE_APPLE:
case SHOP_ITEM_DONUT:
case SHOP_ITEM_CHICKEN:
case SHOP_ITEM_PRETZEL:
@ -8030,7 +8030,7 @@ const char * ride_type_get_enum_name(sint32 rideType)
nameof(RIDE_TYPE_MINIATURE_RAILWAY),
nameof(RIDE_TYPE_MONORAIL),
nameof(RIDE_TYPE_MINI_SUSPENDED_COASTER),
nameof(RIDE_TYPE_BOAT_RIDE),
nameof(RIDE_TYPE_BOAT_HIRE),
nameof(RIDE_TYPE_WOODEN_WILD_MOUSE),
nameof(RIDE_TYPE_STEEPLECHASE),
nameof(RIDE_TYPE_CAR_RIDE),

6
src/openrct2/ride/ride.h
View File

@ -476,7 +476,7 @@ enum {
RIDE_TYPE_MINIATURE_RAILWAY,
RIDE_TYPE_MONORAIL,
RIDE_TYPE_MINI_SUSPENDED_COASTER,
RIDE_TYPE_BOAT_RIDE,
RIDE_TYPE_BOAT_HIRE,
RIDE_TYPE_WOODEN_WILD_MOUSE,
RIDE_TYPE_STEEPLECHASE = 10,
RIDE_TYPE_CAR_RIDE,
@ -821,7 +821,7 @@ enum {
RIDE_TYPE_FLAG_3 = 1 << 3,
RIDE_TYPE_FLAG_HAS_LEAVE_WHEN_ANOTHER_VEHICLE_ARRIVES_AT_STATION = 1 << 4,
RIDE_TYPE_FLAG_CAN_SYNCHRONISE_ADJACENT_STATIONS = 1 << 5,
RIDE_TYPE_FLAG_TRACK_MUST_BE_ON_WATER = 1 << 6, // used only by boat ride and submarine ride
RIDE_TYPE_FLAG_TRACK_MUST_BE_ON_WATER = 1 << 6, // used only by boat Hire and submarine ride
RIDE_TYPE_FLAG_HAS_G_FORCES = 1 << 7,
RIDE_TYPE_FLAG_CANNOT_HAVE_GAPS = 1 << 8, // used by rides that can't have gaps, like those with a vertical tower, such as the observation tower
RIDE_TYPE_FLAG_HAS_DATA_LOGGING = 1 << 9,
@ -893,7 +893,7 @@ enum {
SHOP_ITEM_HOT_DOG,
SHOP_ITEM_TENTACLE,
SHOP_ITEM_HAT,
SHOP_ITEM_CANDY_APPLE,
SHOP_ITEM_TOFFEE_APPLE,
SHOP_ITEM_TSHIRT,
SHOP_ITEM_DONUT,
SHOP_ITEM_COFFEE,

68
src/openrct2/ride/ride_data.c
View File

@ -38,10 +38,10 @@ const bool hasRunningTrack[RIDE_TYPE_COUNT] = {
true, // 2 Suspended Swinging
true, // 3 Inverted
true, // 4 Steel Mini Coaster
true, // 5 Mini Railroad
true, // 5 Mini Railway
true, // 6 Monorail
true, // 7 Mini Suspended Coaster
false, // 8 Boat Ride
false, // 8 Boat Hire
true, // 9 Wooden Wild Mine/Mouse
true, // a Steeplechase/Motorbike/Soap Box Derby
true, // b Car Ride
@ -139,10 +139,10 @@ const uint8 initialUpkeepCosts[RIDE_TYPE_COUNT] = {
40, // 02 Suspended Swinging
40, // 03 Inverted
40, // 04 Steel Mini Coaster
60, // 05 Mini Railroad
60, // 05 Mini Railway
65, // 06 Monorail
40, // 07 Mini Suspended Coaster
50, // 08 Boat Ride
50, // 08 Boat Hire
40, // 09 Wooden Wild Mine/Mouse
40, // 0a Steeplechase/Motorbike/Soap Box Derby
70, // 0b Car Ride
@ -233,10 +233,10 @@ const uint8 costPerTrackPiece[RIDE_TYPE_COUNT] = {
80, // 02 Suspended Swinging
80, // 03 Inverted
80, // 04 Steel Mini Coaster
0, // 05 Mini Railroad
0, // 05 Mini Railway
0, // 06 Monorail
80, // 07 Mini Suspended Coaster
0, // 08 Boat Ride
0, // 08 Boat Hire
80, // 09 Wooden Wild Mine/Mouse
80, // 0a Steeplechase/Motorbike/Soap Box Derby
0, // 0b Car Ride
@ -330,10 +330,10 @@ const uint8 costPerVehicle[RIDE_TYPE_COUNT] = {
20, // 02 Suspended Swinging
13, // 03 Inverted
8, // 04 Steel Mini Coaster
10, // 05 Mini Railroad
10, // 05 Mini Railway
10, // 06 Monorail
10, // 07 Mini Suspended Coaster
4, // 08 Boat Ride
4, // 08 Boat Hire
9, // 09 Wooden Wild Mine/Mouse
10, // 0a Steeplechase/Motorbike/Soap Box Derby
8, // 0b Car Ride
@ -428,10 +428,10 @@ const bool chargeUpkeepForTrainLength[RIDE_TYPE_COUNT] = {
true, // 02 Suspended Swinging
true, // 03 Inverted
true, // 04 Steel Mini Coaster
true, // 05 Mini Railroad
true, // 05 Mini Railway
true, // 06 Monorail
true, // 07 Mini Suspended Coaster
false, // 08 Boat Ride
false, // 08 Boat Hire
true, // 09 Wooden Wild Mine/Mouse
true, // 0a Steeplechase/Motorbike/Soap Box Derby
true, // 0b Car Ride
@ -523,10 +523,10 @@ const uint8 costPerStation[RIDE_TYPE_COUNT] = {
10, // 02 Suspended Swinging
10, // 03 Inverted
5, // 04 Steel Mini Coaster
5, // 05 Mini Railroad
5, // 05 Mini Railway
10, // 06 Monorail
10, // 07 Mini Suspended Coaster
0, // 08 Boat Ride
0, // 08 Boat Hire
10, // 09 Wooden Wild Mine/Mouse
10, // 0a Steeplechase/Motorbike/Soap Box Derby
5, // 0b Car Ride
@ -618,10 +618,10 @@ const uint8 rideBonusValue[RIDE_TYPE_COUNT] = {
90, // 02 Suspended Swinging
100, // 03 Inverted
60, // 04 Steel Mini Coaster
50, // 05 Mini Railroad
50, // 05 Mini Railway
60, // 06 Monorail
50, // 07 Mini Suspended Coaster
40, // 08 Boat Ride
40, // 08 Boat Hire
55, // 09 Wooden Wild Mine/Mouse
60, // 0a Steeplechase/Motorbike/Soap
50, // 0b Car Ride
@ -729,10 +729,10 @@ const rct_ride_name_convention RideNameConvention[RIDE_TYPE_COUNT] = {
{ RIDE_COMPONENT_TYPE_TRAIN, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }, // 02 Suspended Swinging
{ RIDE_COMPONENT_TYPE_TRAIN, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }, // 03 Inverted
{ RIDE_COMPONENT_TYPE_TRAIN, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }, // 04 Steel Mini Coaster
{ RIDE_COMPONENT_TYPE_TRAIN, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }, // 05 Mini Railroad
{ RIDE_COMPONENT_TYPE_TRAIN, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }, // 05 Mini Railway
{ RIDE_COMPONENT_TYPE_TRAIN, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }, // 06 Monorail
{ RIDE_COMPONENT_TYPE_CAR, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }, // 07 Mini Suspended Coaster
{ RIDE_COMPONENT_TYPE_BOAT, RIDE_COMPONENT_TYPE_DOCKING_PLATFORM, RIDE_COMPONENT_TYPE_DOCKING_PLATFORM }, // 08 Boat Ride
{ RIDE_COMPONENT_TYPE_BOAT, RIDE_COMPONENT_TYPE_DOCKING_PLATFORM, RIDE_COMPONENT_TYPE_DOCKING_PLATFORM }, // 08 Boat Hire
{ RIDE_COMPONENT_TYPE_CAR, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }, // 09 Wooden Wild Mine/Mouse
{ RIDE_COMPONENT_TYPE_CAR, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }, // 0a Steeplechase/Motorbike/Soap Box Derby
{ RIDE_COMPONENT_TYPE_CAR, RIDE_COMPONENT_TYPE_TRACK, RIDE_COMPONENT_TYPE_STATION }, // 0b Car Ride
@ -826,7 +826,7 @@ const rct_ride_name RideNaming[] = {
{ STR_RIDE_NAME_MINIATURE_RAILWAY, STR_RIDE_DESCRIPTION_MINIATURE_RAILWAY }, // RIDE_TYPE_MINIATURE_RAILWAY
{ STR_RIDE_NAME_MONORAIL, STR_RIDE_DESCRIPTION_MONORAIL }, // RIDE_TYPE_MONORAIL
{ STR_RIDE_NAME_MINI_SUSPENDED_COASTER, STR_RIDE_DESCRIPTION_MINI_SUSPENDED_COASTER }, // RIDE_TYPE_MINI_SUSPENDED_COASTER
{ STR_RIDE_NAME_BOAT_RIDE, STR_RIDE_DESCRIPTION_BOAT_RIDE }, // RIDE_TYPE_BOAT_RIDE
{ STR_RIDE_NAME_BOAT_HIRE, STR_RIDE_DESCRIPTION_BOAT_HIRE }, // RIDE_TYPE_BOAT_HIRE
{ STR_RIDE_NAME_WOODEN_WILD_MOUSE, STR_RIDE_DESCRIPTION_WOODEN_WILD_MOUSE }, // RIDE_TYPE_WOODEN_WILD_MOUSE
{ STR_RIDE_NAME_STEEPLECHASE, STR_RIDE_DESCRIPTION_STEEPLECHASE }, // RIDE_TYPE_STEEPLECHASE
{ STR_RIDE_NAME_CAR_RIDE, STR_RIDE_DESCRIPTION_CAR_RIDE }, // RIDE_TYPE_CAR_RIDE
@ -921,10 +921,10 @@ const uint8 RideAvailableModes[] = {
RIDE_MODE_CONTINUOUS_CIRCUIT, RIDE_MODE_CONTINUOUS_CIRCUIT_BLOCK_SECTIONED, 0xFF, // 02 Suspended Swinging
RIDE_MODE_CONTINUOUS_CIRCUIT, RIDE_MODE_CONTINUOUS_CIRCUIT_BLOCK_SECTIONED, 0xFF, // 03 Inverted
RIDE_MODE_CONTINUOUS_CIRCUIT, RIDE_MODE_CONTINUOUS_CIRCUIT_BLOCK_SECTIONED, RIDE_MODE_REVERSE_INCLINE_LAUNCHED_SHUTTLE, 0xFF, // 04 Steel Mini Coaster
RIDE_MODE_CONTINUOUS_CIRCUIT, RIDE_MODE_SHUTTLE, 0xFF, // 05 Mini Railroad
RIDE_MODE_CONTINUOUS_CIRCUIT, RIDE_MODE_SHUTTLE, 0xFF, // 05 Mini Railway
RIDE_MODE_CONTINUOUS_CIRCUIT, RIDE_MODE_SHUTTLE, 0xFF, // 06 Monorail
RIDE_MODE_CONTINUOUS_CIRCUIT, 0xFF, // 07 Mini Suspended Coaster
RIDE_MODE_BOAT_HIRE, 0xFF, // 08 Boat Ride
RIDE_MODE_BOAT_HIRE, 0xFF, // 08 Boat Hire
RIDE_MODE_CONTINUOUS_CIRCUIT, 0xFF, // 09 Wooden Wild Mine/Mouse
RIDE_MODE_CONTINUOUS_CIRCUIT, RIDE_MODE_CONTINUOUS_CIRCUIT_BLOCK_SECTIONED, 0xFF, // 0A Steeplechase/Motorbike/Soap Box Derby
RIDE_MODE_CONTINUOUS_CIRCUIT, 0xFF, // 0B Car Ride
@ -1019,10 +1019,10 @@ const uint8 RideAvailableBreakdowns[] = {
(1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), // 02 Suspended Swinging
(1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), // 03 Inverted
(1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), // 04 Steel Mini Coaster
(1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), // 05 Mini Railroad
(1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), // 05 Mini Railway
(1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_DOORS_STUCK_CLOSED) | (1 << BREAKDOWN_DOORS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), // 06 Monorail
(1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_RESTRAINTS_STUCK_CLOSED) | (1 << BREAKDOWN_RESTRAINTS_STUCK_OPEN) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), // 07 Mini Suspended Coaster
(1 << BREAKDOWN_VEHICLE_MALFUNCTION), // 08 Boat Ride
(1 << BREAKDOWN_VEHICLE_MALFUNCTION), // 08 Boat Hire
(1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), // 09 Wooden Wild Mine/Mouse
(1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION) | (1 << BREAKDOWN_BRAKES_FAILURE), // 0A Steeplechase/Motorbike/Soap Box Derby
(1 << BREAKDOWN_SAFETY_CUT_OUT) | (1 << BREAKDOWN_VEHICLE_MALFUNCTION), // 0B Car Ride
@ -1134,7 +1134,7 @@ const rct_ride_data_4 RideData4[RIDE_TYPE_COUNT] = {
{ 10, 0, RIDE_TYPE_FLAG4_ALLOW_MUSIC | RIDE_TYPE_FLAG4_HAS_ENTRANCE_EXIT | RIDE_TYPE_FLAG4_ALLOW_MORE_VEHICLES_THAN_STATION_FITS | RIDE_TYPE_FLAG4_ALLOW_MULTIPLE_CIRCUITS | RIDE_TYPE_FLAG4_TRANSPORT_RIDE | RIDE_TYPE_FLAG4_SHOW_IN_TRACK_DESIGNER, MUSIC_STYLE_SUMMER, 0 }, // RIDE_TYPE_MINIATURE_RAILWAY
{ 10, 0, RIDE_TYPE_FLAG4_ALLOW_MUSIC | RIDE_TYPE_FLAG4_HAS_ENTRANCE_EXIT | RIDE_TYPE_FLAG4_ALLOW_MORE_VEHICLES_THAN_STATION_FITS | RIDE_TYPE_FLAG4_ALLOW_MULTIPLE_CIRCUITS | RIDE_TYPE_FLAG4_TRANSPORT_RIDE | RIDE_TYPE_FLAG4_SHOW_IN_TRACK_DESIGNER, MUSIC_STYLE_SUMMER, 0 }, // RIDE_TYPE_MONORAIL
{ 20, 20, RIDE_TYPE_FLAG4_ALLOW_MUSIC | RIDE_TYPE_FLAG4_PEEP_CHECK_GFORCES | RIDE_TYPE_FLAG4_HAS_ENTRANCE_EXIT | RIDE_TYPE_FLAG4_HAS_AIR_TIME | RIDE_TYPE_FLAG4_SHOW_IN_TRACK_DESIGNER | RIDE_TYPE_FLAG4_INTERESTING_TO_LOOK_AT, MUSIC_STYLE_WILD_WEST, 0 }, // RIDE_TYPE_MINI_SUSPENDED_COASTER
{ 10, 0, RIDE_TYPE_FLAG4_ALLOW_MUSIC | RIDE_TYPE_FLAG4_HAS_ENTRANCE_EXIT, MUSIC_STYLE_WATER, 0 }, // RIDE_TYPE_BOAT_RIDE
{ 10, 0, RIDE_TYPE_FLAG4_ALLOW_MUSIC | RIDE_TYPE_FLAG4_HAS_ENTRANCE_EXIT, MUSIC_STYLE_WATER, 0 }, // RIDE_TYPE_BOAT_HIRE
{ 20, 20, RIDE_TYPE_FLAG4_ALLOW_DOORS_ON_TRACK | RIDE_TYPE_FLAG4_ALLOW_MUSIC | RIDE_TYPE_FLAG4_PEEP_CHECK_GFORCES | RIDE_TYPE_FLAG4_HAS_ENTRANCE_EXIT | RIDE_TYPE_FLAG4_HAS_AIR_TIME | RIDE_TYPE_FLAG4_SHOW_IN_TRACK_DESIGNER | RIDE_TYPE_FLAG4_INTERESTING_TO_LOOK_AT, MUSIC_STYLE_WILD_WEST, 0 }, // RIDE_TYPE_WOODEN_WILD_MOUSE
{ 20, 20, RIDE_TYPE_FLAG4_ALLOW_MUSIC | RIDE_TYPE_FLAG4_PEEP_CHECK_GFORCES | RIDE_TYPE_FLAG4_HAS_ENTRANCE_EXIT | RIDE_TYPE_FLAG4_HAS_AIR_TIME | RIDE_TYPE_FLAG4_SHOW_IN_TRACK_DESIGNER | RIDE_TYPE_FLAG4_INTERESTING_TO_LOOK_AT, MUSIC_STYLE_ROCK, 0 }, // RIDE_TYPE_STEEPLECHASE
{ 15, 0, RIDE_TYPE_FLAG4_ALLOW_DOORS_ON_TRACK | RIDE_TYPE_FLAG4_ALLOW_MUSIC | RIDE_TYPE_FLAG4_HAS_ENTRANCE_EXIT | RIDE_TYPE_FLAG4_ALLOW_MORE_VEHICLES_THAN_STATION_FITS | RIDE_TYPE_FLAG4_SHOW_IN_TRACK_DESIGNER | RIDE_TYPE_FLAG4_SLIGHTLY_INTERESTING_TO_LOOK_AT, MUSIC_STYLE_SUMMER, 0 }, // RIDE_TYPE_CAR_RIDE
@ -1229,7 +1229,7 @@ const ride_cost RideTrackCosts[RIDE_TYPE_COUNT] = {
{ 35, 6 }, // RIDE_TYPE_MINIATURE_RAILWAY
{ 42, 5 }, // RIDE_TYPE_MONORAIL
{ 60, 5 }, // RIDE_TYPE_MINI_SUSPENDED_COASTER
{ 55, 5 }, // RIDE_TYPE_BOAT_RIDE
{ 55, 5 }, // RIDE_TYPE_BOAT_HIRE
{ 50, 6 }, // RIDE_TYPE_WOODEN_WILD_MOUSE
{ 57, 4 }, // RIDE_TYPE_STEEPLECHASE
{ 25, 5 }, // RIDE_TYPE_CAR_RIDE
@ -1324,7 +1324,7 @@ const rct_ride_data_5 RideData5[RIDE_TYPE_COUNT] = {
{ 7, 32, 5, 39, 9, 50, 50, 0 }, // RIDE_TYPE_MINIATURE_RAILWAY
{ 8, 32, 8, 78, 9, 50, 60, 0 }, // RIDE_TYPE_MONORAIL
{ 10, 24, 24, 3, 8, 40, 50, 0 }, // RIDE_TYPE_MINI_SUSPENDED_COASTER
{ 255, 16, 0, 255, 3, 5, 40, 0 }, // RIDE_TYPE_BOAT_RIDE
{ 255, 16, 0, 255, 3, 5, 40, 0 }, // RIDE_TYPE_BOAT_HIRE
{ 14, 24, 4, 4, 7, 40, 55, 0 }, // RIDE_TYPE_WOODEN_WILD_MOUSE
{ 14, 24, 7, 4, 7, 40, 60, 0 }, // RIDE_TYPE_STEEPLECHASE
{ 6, 24, 4, 2, 7, 30, 50, 0 }, // RIDE_TYPE_CAR_RIDE
@ -1431,7 +1431,7 @@ const money8 DefaultShopItemPrice[SHOP_ITEM_COUNT] = {
MONEY(1,00), // SHOP_ITEM_HOT_DOG
MONEY(1,50), // SHOP_ITEM_TENTACLE
MONEY(1,50), // SHOP_ITEM_HAT
MONEY(0,70), // SHOP_ITEM_CANDY_APPLE
MONEY(0,70), // SHOP_ITEM_TOFFEE_APPLE
MONEY(3,00), // SHOP_ITEM_TSHIRT
MONEY(0,70), // SHOP_ITEM_DONUT
MONEY(1,20), // SHOP_ITEM_COFFEE
@ -1547,7 +1547,7 @@ const uint32 ShopItemImage[SHOP_ITEM_COUNT] = {
SPR_SHOP_ITEM_HOT_DOG,
SPR_SHOP_ITEM_TENTACLE,
SPR_SHOP_ITEM_HAT,
SPR_SHOP_ITEM_CANDY_APPLE,
SPR_SHOP_ITEM_TOFFEE_APPLE,
SPR_SHOP_ITEM_TSHIRT,
SPR_SHOP_ITEM_DONUT,
SPR_SHOP_ITEM_COFFEE,
@ -1649,10 +1649,10 @@ const rct_ride_lift_data RideLiftData[] = {
{ SOUND_LIFT_1, 4, 6 }, // Suspended Swinging
{ SOUND_LIFT_7, 5, 7 }, // Inverted
{ SOUND_LIFT_3, 4, 6 }, // Steel Mini Coaster
{ 255, 5, 5 }, // Mini Railroad
{ 255, 5, 5 }, // Mini Railway
{ 255, 5, 5 }, // Monorail
{ SOUND_LIFT_3, 4, 5 }, // Mini Suspended Coaster
{ 255, 5, 5 }, // Boat Ride
{ 255, 5, 5 }, // Boat Hire
{ SOUND_LIFT_1, 4, 5 }, // Wooden Wild Mine/Mouse
{ SOUND_LIFT_1, 4, 5 }, // Steeplechase/Motorbike/Soap Box D
{ 255, 5, 5 }, // Car Ride
@ -1747,7 +1747,7 @@ const sint32 RidePhotoItems[] = {
SHOP_ITEM_PHOTO, // RIDE_TYPE_MINIATURE_RAILWAY
SHOP_ITEM_PHOTO, // RIDE_TYPE_MONORAIL
SHOP_ITEM_PHOTO2, // RIDE_TYPE_MINI_SUSPENDED_COASTER
SHOP_ITEM_PHOTO, // RIDE_TYPE_BOAT_RIDE
SHOP_ITEM_PHOTO, // RIDE_TYPE_BOAT_HIRE
SHOP_ITEM_PHOTO3, // RIDE_TYPE_WOODEN_WILD_MOUSE
SHOP_ITEM_PHOTO, // RIDE_TYPE_STEEPLECHASE
SHOP_ITEM_PHOTO, // RIDE_TYPE_CAR_RIDE
@ -1842,7 +1842,7 @@ const rating_tuple RideRatings[RIDE_TYPE_COUNT] = {
{ 70, 6, -10 }, // RIDE_TYPE_MINIATURE_RAILWAY
{ 70, 6, -10 }, // RIDE_TYPE_MONORAIL
{ 50, 30, 10 }, // RIDE_TYPE_MINI_SUSPENDED_COASTER
{ 70, 6, 0 }, // RIDE_TYPE_BOAT_RIDE
{ 70, 6, 0 }, // RIDE_TYPE_BOAT_HIRE
{ 50, 30, 30 }, // RIDE_TYPE_WOODEN_WILD_MOUSE
{ 50, 30, 10 }, // RIDE_TYPE_STEEPLECHASE
{ 70, 10, 10 }, // RIDE_TYPE_CAR_RIDE
@ -1983,7 +1983,7 @@ const rct_ride_properties RideProperties[RIDE_TYPE_COUNT] = {
{RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_MAIN | RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_SUPPORTS | RIDE_TYPE_FLAG_TRACK_MUST_BE_ON_WATER |
RIDE_TYPE_FLAG_NO_TEST_MODE | RIDE_TYPE_FLAG_HAS_LOAD_OPTIONS | RIDE_TYPE_FLAG_HAS_VEHICLE_COLOURS | RIDE_TYPE_FLAG_CHECK_FOR_STALLING |
RIDE_TYPE_FLAG_HAS_TRACK | RIDE_TYPE_FLAG_SUPPORTS_MULTIPLE_TRACK_COLOUR,
0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_BOAT_RIDE
0, 0, 0, 0, 0, 0 }, // RIDE_TYPE_BOAT_HIRE
{RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_MAIN | RIDE_TYPE_FLAG_HAS_TRACK_COLOUR_SUPPORTS |
RIDE_TYPE_FLAG_HAS_LEAVE_WHEN_ANOTHER_VEHICLE_ARRIVES_AT_STATION |
RIDE_TYPE_FLAG_CAN_SYNCHRONISE_ADJACENT_STATIONS | RIDE_TYPE_FLAG_HAS_G_FORCES |
@ -2453,7 +2453,7 @@ const rct_shop_item_stats ShopItemStats[SHOP_ITEM_COUNT] = {
{ 5, 17, 17, 20 }, // SHOP_ITEM_HOT_DOG
{ 11, 22, 20, 18 }, // SHOP_ITEM_TENTACLE
{ 9, 27, 32, 24 }, // SHOP_ITEM_HAT
{ 4, 10, 10, 10 }, // SHOP_ITEM_CANDY_APPLE
{ 4, 10, 10, 10 }, // SHOP_ITEM_TOFFEE_APPLE
{ 20, 37, 37, 37 }, // SHOP_ITEM_TSHIRT
{ 4, 8, 7, 10 }, // SHOP_ITEM_DONUT
{ 3, 11, 15, 20 }, // SHOP_ITEM_COFFEE
@ -2500,7 +2500,7 @@ const uint8 RideConstructionDefaultTrackType[] = {
TRACK_ELEM_END_STATION, // RIDE_TYPE_MINIATURE_RAILWAY
TRACK_ELEM_END_STATION, // RIDE_TYPE_MONORAIL
TRACK_ELEM_END_STATION, // RIDE_TYPE_MINI_SUSPENDED_COASTER
TRACK_ELEM_END_STATION, // RIDE_TYPE_BOAT_RIDE
TRACK_ELEM_END_STATION, // RIDE_TYPE_BOAT_HIRE
TRACK_ELEM_END_STATION, // RIDE_TYPE_WOODEN_WILD_MOUSE
TRACK_ELEM_END_STATION, // RIDE_TYPE_STEEPLECHASE
TRACK_ELEM_END_STATION, // RIDE_TYPE_CAR_RIDE
@ -2655,7 +2655,7 @@ const track_colour_preset_list RideColourPresets[] = {
{ COLOUR_BRIGHT_RED, COLOUR_BRIGHT_RED, COLOUR_BLACK },
),
// RIDE_TYPE_BOAT_RIDE
// RIDE_TYPE_BOAT_HIRE
TRACK_COLOUR_PRESETS(
{ COLOUR_MOSS_GREEN, COLOUR_MOSS_GREEN, COLOUR_WHITE },
{ COLOUR_BLACK, COLOUR_BLACK, COLOUR_DARK_GREEN },

8
src/openrct2/ride/ride_ratings.c
View File

@ -788,7 +788,7 @@ static uint16 ride_compute_upkeep(Ride *ride)
upkeep += 3 * ride->num_cars_per_train;
}
// slight upkeep boosts for some rides - 5 for mini railroad, 10 for log
// slight upkeep boosts for some rides - 5 for mini railway, 10 for log
// flume/rapids, 10 for roller coaster, 28 for giga coaster
upkeep += costPerStation[ride->type] * ride->num_stations;
@ -1838,7 +1838,7 @@ static void ride_ratings_calculate_mini_suspended_coaster(Ride *ride)
ride->inversions |= get_num_of_sheltered_eighths(ride) << 5;
}
static void ride_ratings_calculate_boat_ride(Ride *ride)
static void ride_ratings_calculate_boat_hire(Ride *ride)
{
ride->unreliability_factor = 7;
set_unreliability_factor(ride);
@ -4003,7 +4003,7 @@ static void ride_ratings_calculate_submarine_ride(Ride *ride)
ride->unreliability_factor = 7;
set_unreliability_factor(ride);
// NOTE Fixed bug from original game, see boat ride.
// NOTE Fixed bug from original game, see boat Hire.
rating_tuple ratings;
ride_ratings_set(&ratings, RIDE_RATING(2,20), RIDE_RATING(1,80), RIDE_RATING(1,40));
@ -4262,7 +4262,7 @@ static const ride_ratings_calculation ride_ratings_calculate_func_table[RIDE_TYP
ride_ratings_calculate_miniature_railway, // MINIATURE_RAILWAY
ride_ratings_calculate_monorail, // MONORAIL
ride_ratings_calculate_mini_suspended_coaster, // MINI_SUSPENDED_COASTER
ride_ratings_calculate_boat_ride, // BOAT_RIDE
ride_ratings_calculate_boat_hire, // BOAT_HIRE
ride_ratings_calculate_wooden_wild_mouse, // WOODEN_WILD_MOUSE
ride_ratings_calculate_steeplechase, // STEEPLECHASE
ride_ratings_calculate_car_ride, // CAR_RIDE

2
src/openrct2/ride/track_paint.h
View File

@ -342,7 +342,7 @@ TRACK_PAINT_FUNCTION get_track_paint_function_junior_rc(sint32 trackType, sint32
TRACK_PAINT_FUNCTION get_track_paint_function_monorail(sint32 trackType, sint32 direction);
TRACK_PAINT_FUNCTION get_track_paint_function_mini_suspended_rc(sint32 trackType, sint32 direction);
TRACK_PAINT_FUNCTION get_track_paint_function_miniature_railway(sint32 trackType, sint32 direction);
TRACK_PAINT_FUNCTION get_track_paint_function_boat_ride(sint32 trackType, sint32 direction);
TRACK_PAINT_FUNCTION get_track_paint_function_boat_hire(sint32 trackType, sint32 direction);
TRACK_PAINT_FUNCTION get_track_paint_function_wooden_wild_mouse(sint32 trackType, sint32 direction);
TRACK_PAINT_FUNCTION get_track_paint_function_steeplechase(sint32 trackType, sint32 direction);
TRACK_PAINT_FUNCTION get_track_paint_function_car_ride(sint32 trackType, sint32 direction);

68
src/openrct2/ride/water/BoatRide.cpp → src/openrct2/ride/water/BoatHire.cpp
View File

@ -22,40 +22,40 @@
enum
{
SPR_BOAT_RIDE_FLAT_BACK_SW_NE = 28523,
SPR_BOAT_RIDE_FLAT_FRONT_SW_NE = 28524,
SPR_BOAT_RIDE_FLAT_BACK_NW_SE = 28525,
SPR_BOAT_RIDE_FLAT_FRONT_NW_SE = 28526,
SPR_BOAT_RIDE_FLAT_QUARTER_TURN_1_TILE_BACK_SW_NW = 28527,
SPR_BOAT_RIDE_FLAT_QUARTER_TURN_1_TILE_FRONT_SW_NW = 28528,
SPR_BOAT_RIDE_FLAT_QUARTER_TURN_1_TILE_BACK_NW_NE = 28529,
SPR_BOAT_RIDE_FLAT_QUARTER_TURN_1_TILE_FRONT_NW_NE = 28530,
SPR_BOAT_RIDE_FLAT_QUARTER_TURN_1_TILE_BACK_NE_SE = 28531,
SPR_BOAT_RIDE_FLAT_QUARTER_TURN_1_TILE_FRONT_NE_SE = 28532,
SPR_BOAT_RIDE_FLAT_QUARTER_TURN_1_TILE_FRONT_SE_SW = 28533,
SPR_BOAT_RIDE_FLAT_QUARTER_TURN_1_TILE_BACK_SE_SW = 28534,
SPR_BOAT_HIRE_FLAT_BACK_SW_NE = 28523,
SPR_BOAT_HIRE_FLAT_FRONT_SW_NE = 28524,
SPR_BOAT_HIRE_FLAT_BACK_NW_SE = 28525,
SPR_BOAT_HIRE_FLAT_FRONT_NW_SE = 28526,
SPR_BOAT_HIRE_FLAT_QUARTER_TURN_1_TILE_BACK_SW_NW = 28527,
SPR_BOAT_HIRE_FLAT_QUARTER_TURN_1_TILE_FRONT_SW_NW = 28528,
SPR_BOAT_HIRE_FLAT_QUARTER_TURN_1_TILE_BACK_NW_NE = 28529,
SPR_BOAT_HIRE_FLAT_QUARTER_TURN_1_TILE_FRONT_NW_NE = 28530,
SPR_BOAT_HIRE_FLAT_QUARTER_TURN_1_TILE_BACK_NE_SE = 28531,
SPR_BOAT_HIRE_FLAT_QUARTER_TURN_1_TILE_FRONT_NE_SE = 28532,
SPR_BOAT_HIRE_FLAT_QUARTER_TURN_1_TILE_FRONT_SE_SW = 28533,
SPR_BOAT_HIRE_FLAT_QUARTER_TURN_1_TILE_BACK_SE_SW = 28534,
};
/** rct2: 0x008B0E40 */
static void paint_boat_ride_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,
static void paint_boat_hire_track_flat(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,
sint32 height, rct_tile_element * tileElement)
{
uint32 imageId;
if (direction & 1)
{
imageId = SPR_BOAT_RIDE_FLAT_BACK_NW_SE | session->TrackColours[SCHEME_TRACK];
imageId = SPR_BOAT_HIRE_FLAT_BACK_NW_SE | session->TrackColours[SCHEME_TRACK];
sub_98197C(session, imageId, 0, 0, 1, 32, 3, height, 4, 0, height, get_current_rotation());
imageId = SPR_BOAT_RIDE_FLAT_FRONT_NW_SE | session->TrackColours[SCHEME_TRACK];
imageId = SPR_BOAT_HIRE_FLAT_FRONT_NW_SE | session->TrackColours[SCHEME_TRACK];
sub_98197C(session, imageId, 0, 0, 1, 32, 3, height, 28, 0, height, get_current_rotation());
}
else
{
imageId = SPR_BOAT_RIDE_FLAT_BACK_SW_NE | session->TrackColours[SCHEME_TRACK];
imageId = SPR_BOAT_HIRE_FLAT_BACK_SW_NE | session->TrackColours[SCHEME_TRACK];
sub_98197C(session, imageId, 0, 0, 32, 1, 3, height, 0, 4, height, get_current_rotation());
imageId = SPR_BOAT_RIDE_FLAT_FRONT_SW_NE | session->TrackColours[SCHEME_TRACK];
imageId = SPR_BOAT_HIRE_FLAT_FRONT_SW_NE | session->TrackColours[SCHEME_TRACK];
sub_98197C(session, imageId, 0, 0, 32, 1, 3, height, 0, 28, height, get_current_rotation());
}
@ -65,7 +65,7 @@ static void paint_boat_ride_track_flat(paint_session * session, uint8 rideIndex,
}
/** rct2: 0x008B0E50 */
static void paint_boat_ride_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,
static void paint_boat_hire_station(paint_session * session, uint8 rideIndex, uint8 trackSequence, uint8 direction,
sint32 height, rct_tile_element * tileElement)
{
LocationXY16 position = session->MapPosition;
@ -90,38 +90,38 @@ static void paint_boat_ride_station(paint_session * session, uint8 rideIndex, ui
}
/** rct2: 0x008B0E80 */
static void paint_boat_ride_track_left_quarter_turn_1_tile(paint_session * session, uint8 rideIndex, uint8 trackSequence,
static void paint_boat_hire_track_left_quarter_turn_1_tile(paint_session * session, uint8 rideIndex, uint8 trackSequence,
uint8 direction, sint32 height, rct_tile_element * tileElement)
{
uint32 imageId;
switch (direction)
{
case 0:
imageId = SPR_BOAT_RIDE_FLAT_QUARTER_TURN_1_TILE_BACK_SW_NW | session->TrackColours[SCHEME_TRACK];
imageId = SPR_BOAT_HIRE_FLAT_QUARTER_TURN_1_TILE_BACK_SW_NW | session->TrackColours[SCHEME_TRACK];
sub_98197C(session, imageId, 0, 0, 32, 32, 0, height, 0, 0, height, get_current_rotation());
imageId = SPR_BOAT_RIDE_FLAT_QUARTER_TURN_1_TILE_FRONT_SW_NW | session->TrackColours[SCHEME_TRACK];
imageId = SPR_BOAT_HIRE_FLAT_QUARTER_TURN_1_TILE_FRONT_SW_NW | session->TrackColours[SCHEME_TRACK];
sub_98197C(session, imageId, 0, 0, 3, 3, 3, height, 28, 28, height + 2, get_current_rotation());
break;
case 1:
imageId = SPR_BOAT_RIDE_FLAT_QUARTER_TURN_1_TILE_BACK_NW_NE | session->TrackColours[SCHEME_TRACK];
imageId = SPR_BOAT_HIRE_FLAT_QUARTER_TURN_1_TILE_BACK_NW_NE | session->TrackColours[SCHEME_TRACK];
sub_98197C(session, imageId, 0, 0, 32, 32, 0, height, 0, 0, height, get_current_rotation());
imageId = SPR_BOAT_RIDE_FLAT_QUARTER_TURN_1_TILE_FRONT_NW_NE | session->TrackColours[SCHEME_TRACK];
imageId = SPR_BOAT_HIRE_FLAT_QUARTER_TURN_1_TILE_FRONT_NW_NE | session->TrackColours[SCHEME_TRACK];
sub_98197C(session, imageId, 0, 0, 3, 3, 3, height, 28, 28, height + 2, get_current_rotation());
break;
case 2:
imageId = SPR_BOAT_RIDE_FLAT_QUARTER_TURN_1_TILE_BACK_NE_SE | session->TrackColours[SCHEME_TRACK];
imageId = SPR_BOAT_HIRE_FLAT_QUARTER_TURN_1_TILE_BACK_NE_SE | session->TrackColours[SCHEME_TRACK];
sub_98197C(session, imageId, 0, 0, 32, 32, 0, height, 0, 0, height, get_current_rotation());
imageId = SPR_BOAT_RIDE_FLAT_QUARTER_TURN_1_TILE_FRONT_NE_SE | session->TrackColours[SCHEME_TRACK];
imageId = SPR_BOAT_HIRE_FLAT_QUARTER_TURN_1_TILE_FRONT_NE_SE | session->TrackColours[SCHEME_TRACK];
sub_98197C(session, imageId, 0, 0, 3, 3, 3, height, 28, 28, height + 2, get_current_rotation());
break;
case 3:
imageId = SPR_BOAT_RIDE_FLAT_QUARTER_TURN_1_TILE_FRONT_SE_SW | session->TrackColours[SCHEME_TRACK];
imageId = SPR_BOAT_HIRE_FLAT_QUARTER_TURN_1_TILE_FRONT_SE_SW | session->TrackColours[SCHEME_TRACK];
sub_98197C(session, imageId, 0, 0, 3, 3, 3, height, 28, 28, height + 2, get_current_rotation());
imageId = SPR_BOAT_RIDE_FLAT_QUARTER_TURN_1_TILE_BACK_SE_SW | session->TrackColours[SCHEME_TRACK];
imageId = SPR_BOAT_HIRE_FLAT_QUARTER_TURN_1_TILE_BACK_SE_SW | session->TrackColours[SCHEME_TRACK];
sub_98197C(session, imageId, 0, 0, 32, 32, 0, height, 0, 0, height, get_current_rotation());
break;
}
@ -132,31 +132,31 @@ static void paint_boat_ride_track_left_quarter_turn_1_tile(paint_session * sessi
}
/** rct2: 0x008B0E90 */
static void paint_boat_ride_track_right_quarter_turn_1_tile(paint_session * session, uint8 rideIndex, uint8 trackSequence,
static void paint_boat_hire_track_right_quarter_turn_1_tile(paint_session * session, uint8 rideIndex, uint8 trackSequence,
uint8 direction, sint32 height, rct_tile_element * tileElement)
{
paint_boat_ride_track_left_quarter_turn_1_tile(session, rideIndex, trackSequence, (direction + 3) % 4, height, tileElement);
paint_boat_hire_track_left_quarter_turn_1_tile(session, rideIndex, trackSequence, (direction + 3) % 4, height, tileElement);
}
/**
* rct2: 0x008B0D60
*/
TRACK_PAINT_FUNCTION get_track_paint_function_boat_ride(sint32 trackType, sint32 direction)
TRACK_PAINT_FUNCTION get_track_paint_function_boat_hire(sint32 trackType, sint32 direction)
{
switch (trackType)
{
case TRACK_ELEM_FLAT:
return paint_boat_ride_track_flat;
return paint_boat_hire_track_flat;
case TRACK_ELEM_END_STATION:
case TRACK_ELEM_BEGIN_STATION:
case TRACK_ELEM_MIDDLE_STATION:
return paint_boat_ride_station;
return paint_boat_hire_station;
case TRACK_ELEM_LEFT_QUARTER_TURN_1_TILE:
return paint_boat_ride_track_left_quarter_turn_1_tile;
return paint_boat_hire_track_left_quarter_turn_1_tile;
case TRACK_ELEM_RIGHT_QUARTER_TURN_1_TILE:
return paint_boat_ride_track_right_quarter_turn_1_tile;
return paint_boat_hire_track_right_quarter_turn_1_tile;
}
return NULL;

6
src/openrct2/sprites.h
View File

@ -76,7 +76,7 @@ enum {
SPR_SHOP_ITEM_HOT_DOG = 5077,
SPR_SHOP_ITEM_TENTACLE = 5078,
SPR_SHOP_ITEM_HAT = 5079,
SPR_SHOP_ITEM_CANDY_APPLE = 5080,
SPR_SHOP_ITEM_TOFFEE_APPLE = 5080,
SPR_SHOP_ITEM_TSHIRT = 5081,
SPR_SHOP_ITEM_DONUT = 5082,
SPR_SHOP_ITEM_COFFEE = 5083,
@ -568,8 +568,8 @@ enum {
SPR_RIDE_DESIGN_PREVIEW_MONORAIL_SUPPORTS = 14235,
SPR_RIDE_DESIGN_PREVIEW_MINI_SUSPENDED_COASTER_TRACK = 14236,
SPR_RIDE_DESIGN_PREVIEW_MINI_SUSPENDED_COASTER_SUPPORTS = 14237,
SPR_RIDE_DESIGN_PREVIEW_BOAT_RIDE_TRACK = 14238,
SPR_RIDE_DESIGN_PREVIEW_BOAT_RIDE_SUPPORTS = 14239,
SPR_RIDE_DESIGN_PREVIEW_BOAT_HIRE_TRACK = 14238,
SPR_RIDE_DESIGN_PREVIEW_BOAT_HIRE_SUPPORTS = 14239,
SPR_RIDE_DESIGN_PREVIEW_WOODEN_WILD_MOUSE_TRACK = 14240,
SPR_RIDE_DESIGN_PREVIEW_WOODEN_WILD_MOUSE_SUPPORTS = 14241,
SPR_RIDE_DESIGN_PREVIEW_STEEPLECHASE_TRACK = 14242,

4
test/testpaint/data.c
View File

@ -26,7 +26,7 @@ const utf8string RideNames[RIDE_TYPE_COUNT] = {
"MiniatureRailway",
"Monorail",
"MiniSuspendedCoaster",
"BoatRide",
"BoatHire",
"WoodenWildMouse",
"Steeplechase",
"CarRide",
@ -897,7 +897,7 @@ const utf8string RideCodeNames[RIDE_TYPE_COUNT] = {
"miniature_railway",
"monorail",
"mini_suspended_rc",
"boat_ride",
"boat_hire",
"wooden_wild_mouse",
"steeplechase",
"car_ride",

2
test/tests/testdata/ratings/bpb.sv6.txt vendored
View File

@ -39,7 +39,7 @@ RIDE_TYPE_MERRY_GO_ROUND: (106, 60, 75)
RIDE_TYPE_DODGEMS: (275, 80, 35)
RIDE_TYPE_TWIST: (173, 157, 250)
RIDE_TYPE_LAUNCHED_FREEFALL: (379, 879, 543)
RIDE_TYPE_BOAT_RIDE: (269, 89, 100)
RIDE_TYPE_BOAT_HIRE: (269, 89, 100)
RIDE_TYPE_MOTION_SIMULATOR: (290, 350, 300)
RIDE_TYPE_DRINK_STALL: (-1, 0, 0)
RIDE_TYPE_CHAIRLIFT: (289, 55, 51)