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

Remove some Americanisms

This commit is contained in:
Gymnasiast 2020-04-25 15:34:43 +02:00
parent 100236c2d2
commit e67ebed697
No known key found for this signature in database
GPG Key ID: DBFFF47AB2CA3EDD
19 changed files with 56 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/openrct2-ui/windows/Cheats.cpp
View File

@ -108,8 +108,8 @@ enum WINDOW_CHEATS_WIDGET_IDX
WIDX_GUEST_NAUSEA_MIN,
WIDX_GUEST_NAUSEA_TOLERANCE_MAX,
WIDX_GUEST_NAUSEA_TOLERANCE_MIN,
WIDX_GUEST_BATHROOM_MAX,
WIDX_GUEST_BATHROOM_MIN,
WIDX_GUEST_TOILET_MAX,
WIDX_GUEST_TOILET_MIN,
WIDX_GUEST_RIDE_INTENSITY_MORE_THAN_1,
WIDX_GUEST_RIDE_INTENSITY_LESS_THAN_15,
WIDX_GUEST_IGNORE_RIDE_INTENSITY,
@ -248,8 +248,8 @@ static rct_widget window_cheats_guests_widgets[] =
{ WWT_BUTTON, 1, MIN_BTN_LEFT, MIN_BTN_RIGHT, YPL(5), HPL(5), STR_MIN, STR_NONE }, // nausea min
{ WWT_BUTTON, 1, MAX_BTN_LEFT, MAX_BTN_RIGHT, YPL(6), HPL(6), STR_MAX, STR_NONE }, // nausea tolerance max
{ WWT_BUTTON, 1, MIN_BTN_LEFT, MIN_BTN_RIGHT, YPL(6), HPL(6), STR_MIN, STR_NONE }, // nausea tolerance min
{ WWT_BUTTON, 1, MAX_BTN_LEFT, MAX_BTN_RIGHT, YPL(7), HPL(7), STR_MAX, STR_NONE }, // bathroom max
{ WWT_BUTTON, 1, MIN_BTN_LEFT, MIN_BTN_RIGHT, YPL(7), HPL(7), STR_MIN, STR_NONE }, // bathroom min
{ WWT_BUTTON, 1, MAX_BTN_LEFT, MAX_BTN_RIGHT, YPL(7), HPL(7), STR_MAX, STR_NONE }, // toilet max
{ WWT_BUTTON, 1, MIN_BTN_LEFT, MIN_BTN_RIGHT, YPL(7), HPL(7), STR_MIN, STR_NONE }, // toilet min
{ WWT_BUTTON, 1, XPL(1), WPL(1), YPL(9), HPL(9), STR_CHEAT_MORE_THAN_1, STR_NONE }, // ride intensity > 1
{ WWT_BUTTON, 1, XPL(0), WPL(0), YPL(9), HPL(9), STR_CHEAT_LESS_THAN_15, STR_NONE }, // ride intensity < 15
{ WWT_CHECKBOX, 1, XPL(0), OWPL, YPL(10), OHPL(10), STR_CHEAT_IGNORE_INTENSITY, STR_CHEAT_IGNORE_INTENSITY_TIP }, // guests ignore intensity
@ -522,8 +522,8 @@ static uint64_t window_cheats_page_enabled_widgets[] = {
(1ULL << WIDX_GUEST_NAUSEA_MIN) |
(1ULL << WIDX_GUEST_NAUSEA_TOLERANCE_MAX) |
(1ULL << WIDX_GUEST_NAUSEA_TOLERANCE_MIN) |
(1ULL << WIDX_GUEST_BATHROOM_MAX) |
(1ULL << WIDX_GUEST_BATHROOM_MIN) |
(1ULL << WIDX_GUEST_TOILET_MAX) |
(1ULL << WIDX_GUEST_TOILET_MIN) |
(1ULL << WIDX_GUEST_RIDE_INTENSITY_MORE_THAN_1) |
(1ULL << WIDX_GUEST_RIDE_INTENSITY_LESS_THAN_15) |
(1ULL << WIDX_GUEST_IGNORE_RIDE_INTENSITY) |
@ -872,11 +872,11 @@ static void window_cheats_guests_mouseup(rct_window* w, rct_widgetindex widgetIn
case WIDX_GUEST_NAUSEA_TOLERANCE_MIN:
CheatsSet(CheatType::SetGuestParameter, GUEST_PARAMETER_NAUSEA_TOLERANCE, PEEP_NAUSEA_TOLERANCE_NONE);
break;
case WIDX_GUEST_BATHROOM_MAX:
CheatsSet(CheatType::SetGuestParameter, GUEST_PARAMETER_BATHROOM, PEEP_MAX_BATHROOM);
case WIDX_GUEST_TOILET_MAX:
CheatsSet(CheatType::SetGuestParameter, GUEST_PARAMETER_TOILET, PEEP_MAX_TOILET);
break;
case WIDX_GUEST_BATHROOM_MIN:
CheatsSet(CheatType::SetGuestParameter, GUEST_PARAMETER_BATHROOM, 0);
case WIDX_GUEST_TOILET_MIN:
CheatsSet(CheatType::SetGuestParameter, GUEST_PARAMETER_TOILET, 0);
break;
case WIDX_GUEST_RIDE_INTENSITY_MORE_THAN_1:
CheatsSet(CheatType::SetGuestParameter, GUEST_PARAMETER_PREFERRED_RIDE_INTENSITY, 1);
@ -1250,8 +1250,7 @@ static void window_cheats_paint(rct_window* w, rct_drawpixelinfo* dpi)
dpi, STR_CHEAT_GUEST_NAUSEA_TOLERANCE, nullptr, COLOUR_BLACK, w->windowPos.x + XPL(0) + TXTO,
w->windowPos.y + YPL(6) + TXTO);
gfx_draw_string_left(
dpi, STR_CHEAT_GUEST_BATHROOM, nullptr, COLOUR_BLACK, w->windowPos.x + XPL(0) + TXTO,
w->windowPos.y + YPL(7) + TXTO);
dpi, STR_CHEAT_GUEST_TOILET, nullptr, COLOUR_BLACK, w->windowPos.x + XPL(0) + TXTO, w->windowPos.y + YPL(7) + TXTO);
gfx_draw_string_left(
dpi, STR_CHEAT_GUEST_PREFERRED_INTENSITY, nullptr, COLOUR_BLACK, w->windowPos.x + XPL(0) + TXTO,
w->windowPos.y + YPL(8) + TXTO);

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

@ -3324,7 +3324,7 @@ static void window_ride_mode_tweak_increase(rct_window* w)
maxValue = 255;
}
uint8_t increment = ride->mode == RIDE_MODE_BUMPERCAR ? 10 : 1;
uint8_t increment = ride->mode == RIDE_MODE_DODGEMS ? 10 : 1;
set_operating_setting(
w->number, RideSetSetting::Operation, std::clamp<int16_t>(ride->operation_option + increment, minValue, maxValue));
@ -3347,7 +3347,7 @@ static void window_ride_mode_tweak_decrease(rct_window* w)
maxValue = 255;
}
uint8_t decrement = ride->mode == RIDE_MODE_BUMPERCAR ? 10 : 1;
uint8_t decrement = ride->mode == RIDE_MODE_DODGEMS ? 10 : 1;
set_operating_setting(
w->number, RideSetSetting::Operation, std::clamp<int16_t>(ride->operation_option - decrement, minValue, maxValue));
@ -3801,7 +3801,7 @@ static void window_ride_operating_invalidate(rct_window* w)
caption = STR_NUMBER_OF_LAPS;
tooltip = STR_NUMBER_OF_LAPS_TIP;
break;
case RIDE_MODE_BUMPERCAR:
case RIDE_MODE_DODGEMS:
format = STR_RIDE_MODE_TIME_LIMIT_VALUE;
caption = STR_TIME_LIMIT;
tooltip = STR_TIME_LIMIT_TIP;

2
src/openrct2/Cheats.h
View File

@ -98,7 +98,7 @@ enum
GUEST_PARAMETER_THIRST,
GUEST_PARAMETER_NAUSEA,
GUEST_PARAMETER_NAUSEA_TOLERANCE,
GUEST_PARAMETER_BATHROOM,
GUEST_PARAMETER_TOILET,
GUEST_PARAMETER_PREFERRED_RIDE_INTENSITY
};

2
src/openrct2/actions/RideSetSetting.hpp
View File

@ -293,7 +293,7 @@ private:
return STR_CANT_CHANGE_SPEED;
case RIDE_MODE_RACE:
return STR_CANT_CHANGE_NUMBER_OF_LAPS;
case RIDE_MODE_BUMPERCAR:
case RIDE_MODE_DODGEMS:
return STR_CANT_CHANGE_TIME_LIMIT;
case RIDE_MODE_SWING:
return STR_CANT_CHANGE_NUMBER_OF_SWINGS;

6
src/openrct2/actions/SetCheatAction.hpp
View File

@ -333,9 +333,9 @@ private:
case GUEST_PARAMETER_NAUSEA_TOLERANCE:
return { { GUEST_PARAMETER_HAPPINESS, GUEST_PARAMETER_PREFERRED_RIDE_INTENSITY },
{ PEEP_NAUSEA_TOLERANCE_NONE, PEEP_NAUSEA_TOLERANCE_HIGH } };
case GUEST_PARAMETER_BATHROOM:
case GUEST_PARAMETER_TOILET:
return { { GUEST_PARAMETER_HAPPINESS, GUEST_PARAMETER_PREFERRED_RIDE_INTENSITY },
{ 0, PEEP_MAX_BATHROOM } };
{ 0, PEEP_MAX_TOILET } };
case GUEST_PARAMETER_PREFERRED_RIDE_INTENSITY:
return { { GUEST_PARAMETER_HAPPINESS, GUEST_PARAMETER_PREFERRED_RIDE_INTENSITY }, { 0, 255 } };
default:
@ -601,7 +601,7 @@ private:
case GUEST_PARAMETER_NAUSEA_TOLERANCE:
peep->nausea_tolerance = value;
break;
case GUEST_PARAMETER_BATHROOM:
case GUEST_PARAMETER_TOILET:
peep->toilet = value;
break;
case GUEST_PARAMETER_PREFERRED_RIDE_INTENSITY:

2
src/openrct2/localisation/Localisation.cpp
View File

@ -120,7 +120,7 @@ const rct_string_id PeepThoughts[] = {
STR_PEEP_THOUGHT_TYPE_TIRED,
STR_PEEP_THOUGHT_TYPE_HUNGRY,
STR_PEEP_THOUGHT_TYPE_THIRSTY,
STR_PEEP_THOUGHT_TYPE_BATHROOM,
STR_PEEP_THOUGHT_TYPE_TOILET,
STR_PEEP_THOUGHT_TYPE_CANT_FIND,
STR_PEEP_THOUGHT_TYPE_NOT_PAYING,
STR_PEEP_THOUGHT_TYPE_NOT_WHILE_RAINING,

6
src/openrct2/localisation/StringIds.h
View File

@ -915,7 +915,7 @@ enum
STR_PEEP_THOUGHT_TYPE_TIRED = 1499,
STR_PEEP_THOUGHT_TYPE_HUNGRY = 1500,
STR_PEEP_THOUGHT_TYPE_THIRSTY = 1501,
STR_PEEP_THOUGHT_TYPE_BATHROOM = 1502,
STR_PEEP_THOUGHT_TYPE_TOILET = 1502,
STR_PEEP_THOUGHT_TYPE_CANT_FIND = 1503,
STR_PEEP_THOUGHT_TYPE_NOT_PAYING = 1504,
STR_PEEP_THOUGHT_TYPE_NOT_WHILE_RAINING = 1505,
@ -2119,7 +2119,7 @@ enum
STR_PEEPS_DISLIKE_VANDALISM = 2808,
STR_PEEPS_ARE_HUNGRY = 2809,
STR_PEEPS_ARE_THIRSTY = 2810,
STR_PEEPS_CANT_FIND_BATHROOM = 2811,
STR_PEEPS_CANT_FIND_TOILET = 2811,
STR_PEEPS_GETTING_LOST_OR_STUCK = 2812,
STR_ENTRANCE_FEE_TOO_HI = 2813,
STR_AWARD_MOST_UNTIDY = 2814,
@ -2841,7 +2841,7 @@ enum
STR_CHEAT_GUEST_THIRST = 5355,
STR_CHEAT_GUEST_NAUSEA = 5356,
STR_CHEAT_GUEST_NAUSEA_TOLERANCE = 5357,
STR_CHEAT_GUEST_BATHROOM = 5358,
STR_CHEAT_GUEST_TOILET = 5358,
STR_CHEAT_REMOVE_ALL_GUESTS = 5359,
STR_CHEAT_REMOVE_ALL_GUESTS_TIP = 5360,
STR_CHEAT_GIVE_ALL_GUESTS = 5361,

2
src/openrct2/management/Award.cpp
View File

@ -418,7 +418,7 @@ static bool award_is_deserved_best_restrooms([[maybe_unused]] int32_t activeAwar
if (peep->outside_of_park != 0)
continue;
if (peep->thoughts[0].freshness <= 5 && peep->thoughts[0].type == PEEP_THOUGHT_TYPE_BATHROOM)
if (peep->thoughts[0].freshness <= 5 && peep->thoughts[0].type == PEEP_THOUGHT_TYPE_TOILET)
guestsWhoNeedRestroom++;
}
return (guestsWhoNeedRestroom <= 16);

20
src/openrct2/peep/Guest.cpp
View File

@ -283,7 +283,7 @@ static constexpr const PeepThoughtType crowded_thoughts[] = {
PEEP_THOUGHT_TYPE_WATCHED,
PEEP_THOUGHT_TYPE_NOT_HUNGRY,
PEEP_THOUGHT_TYPE_NOT_THIRSTY,
PEEP_THOUGHT_TYPE_BATHROOM,
PEEP_THOUGHT_TYPE_TOILET,
PEEP_THOUGHT_TYPE_NONE,
PEEP_THOUGHT_TYPE_NONE,
};
@ -602,10 +602,10 @@ void Guest::HandleEasterEggName()
peep_flags |= PEEP_FLAGS_HUNGER;
}
peep_flags &= ~PEEP_FLAGS_BATHROOM;
peep_flags &= ~PEEP_FLAGS_TOILET;
if (CheckEasterEggName(EASTEREGG_PEEP_NAME_FRANCES_MCGOWAN))
{
peep_flags |= PEEP_FLAGS_BATHROOM;
peep_flags |= PEEP_FLAGS_TOILET;
}
peep_flags &= ~PEEP_FLAGS_CROWDED;
@ -732,7 +732,7 @@ void Guest::Tick128UpdateGuest(int32_t index)
hunger -= 15;
}
if (peep_flags & PEEP_FLAGS_BATHROOM)
if (peep_flags & PEEP_FLAGS_TOILET)
{
if (toilet <= 180)
toilet += 50;
@ -863,7 +863,7 @@ void Guest::Tick128UpdateGuest(int32_t index)
if (toilet >= 160)
{
possible_thoughts[num_thoughts++] = PEEP_THOUGHT_TYPE_BATHROOM;
possible_thoughts[num_thoughts++] = PEEP_THOUGHT_TYPE_TOILET;
}
if (!(gParkFlags & PARK_FLAGS_NO_MONEY) && cash_in_pocket <= MONEY(9, 00) && happiness >= 105
@ -894,7 +894,7 @@ void Guest::Tick128UpdateGuest(int32_t index)
case PEEP_THOUGHT_TYPE_THIRSTY:
peep_head_for_nearest_ride_with_flags(this, RIDE_TYPE_FLAG_SELLS_DRINKS);
break;
case PEEP_THOUGHT_TYPE_BATHROOM:
case PEEP_THOUGHT_TYPE_TOILET:
peep_head_for_nearest_ride_with_flags(this, RIDE_TYPE_FLAG_IS_TOILET);
break;
case PEEP_THOUGHT_TYPE_RUNNING_OUT:
@ -2270,7 +2270,7 @@ bool Guest::ShouldGoToShop(Ride* ride, bool peepAtShop)
return false;
}
// The amount that peeps are willing to pay to use the Toilets scales with their bathroom stat.
// The amount that peeps are willing to pay to use the Toilets scales with their toilet stat.
// It effectively has a minimum of $0.10 (due to the check above) and a maximum of $0.60.
if (ride_get_price(ride) * 40 > toilet)
{
@ -2557,7 +2557,7 @@ bool Guest::FindVehicleToEnter(Ride* ride, std::vector<uint8_t>& car_array)
{
uint8_t chosen_train = RideStation::NO_TRAIN;
if (ride->mode == RIDE_MODE_BUMPERCAR || ride->mode == RIDE_MODE_RACE)
if (ride->mode == RIDE_MODE_DODGEMS || ride->mode == RIDE_MODE_RACE)
{
if (ride->lifecycle_flags & RIDE_LIFECYCLE_PASS_STATION_NO_STOPPING)
return false;
@ -3285,7 +3285,7 @@ void Guest::StopPurchaseThought(uint8_t ride_type)
thoughtType = PEEP_THOUGHT_TYPE_RUNNING_OUT;
if (ride_type != RIDE_TYPE_CASH_MACHINE)
{
thoughtType = PEEP_THOUGHT_TYPE_BATHROOM;
thoughtType = PEEP_THOUGHT_TYPE_TOILET;
if (!ride_type_has_flag(ride_type, RIDE_TYPE_FLAG_IS_TOILET))
{
return;
@ -6935,7 +6935,7 @@ void Guest::UpdateSpriteType()
if (toilet > 220)
{
SetSpriteType(PEEP_SPRITE_TYPE_REQUIRE_BATHROOM);
SetSpriteType(PEEP_SPRITE_TYPE_REQUIRE_TOILET);
return;
}

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

@ -1195,7 +1195,7 @@ void peep_problem_warnings_update()
Ride* ride;
uint16_t spriteIndex;
uint32_t hunger_counter = 0, lost_counter = 0, noexit_counter = 0, thirst_counter = 0, litter_counter = 0,
disgust_counter = 0, bathroom_counter = 0, vandalism_counter = 0;
disgust_counter = 0, toilet_counter = 0, vandalism_counter = 0;
uint8_t* warning_throttle = gPeepWarningThrottle;
FOR_ALL_GUESTS (spriteIndex, peep)
@ -1231,15 +1231,15 @@ void peep_problem_warnings_update()
thirst_counter++;
break;
case PEEP_THOUGHT_TYPE_BATHROOM:
case PEEP_THOUGHT_TYPE_TOILET:
if (peep->guest_heading_to_ride_id == 0xFF)
{
bathroom_counter++;
toilet_counter++;
break;
}
ride = get_ride(peep->guest_heading_to_ride_id);
if (ride != nullptr && !ride_type_has_flag(ride->type, RIDE_TYPE_FLAG_IS_TOILET))
bathroom_counter++;
toilet_counter++;
break;
case PEEP_THOUGHT_TYPE_BAD_LITTER: // 0x1a
@ -1283,12 +1283,12 @@ void peep_problem_warnings_update()
if (warning_throttle[2])
--warning_throttle[2];
else if (bathroom_counter >= PEEP_BATHROOM_WARNING_THRESHOLD && bathroom_counter >= gNumGuestsInPark / 16)
else if (toilet_counter >= PEEP_TOILET_WARNING_THRESHOLD && toilet_counter >= gNumGuestsInPark / 16)
{
warning_throttle[2] = 4;
if (gConfigNotifications.guest_warnings)
{
news_item_add_to_queue(NEWS_ITEM_PEEPS, STR_PEEPS_CANT_FIND_BATHROOM, 22);
news_item_add_to_queue(NEWS_ITEM_PEEPS, STR_PEEPS_CANT_FIND_TOILET, 22);
}
}

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

@ -26,7 +26,7 @@
#define PEEP_HUNGER_WARNING_THRESHOLD 25
#define PEEP_THIRST_WARNING_THRESHOLD 25
#define PEEP_BATHROOM_WARNING_THRESHOLD 28
#define PEEP_TOILET_WARNING_THRESHOLD 28
#define PEEP_LITTER_WARNING_THRESHOLD 23
#define PEEP_DISGUST_WARNING_THRESHOLD 22
#define PEEP_VANDALISM_WARNING_THRESHOLD 15
@ -38,7 +38,7 @@
#define PEEP_MAX_ENERGY 128
#define PEEP_MAX_ENERGY_TARGET 255 // Oddly, this differs from max energy!
#define PEEP_MAX_HUNGER 255
#define PEEP_MAX_BATHROOM 255
#define PEEP_MAX_TOILET 255
#define PEEP_MAX_NAUSEA 255
#define PEEP_MAX_THIRST 255
@ -80,7 +80,7 @@ enum PeepThoughtType : uint8_t
PEEP_THOUGHT_TYPE_TIRED = 19, // "I'm tired"
PEEP_THOUGHT_TYPE_HUNGRY = 20, // "I'm hungry"
PEEP_THOUGHT_TYPE_THIRSTY = 21, // "I'm thirsty"
PEEP_THOUGHT_TYPE_BATHROOM = 22, // "I need to go to the bathroom"
PEEP_THOUGHT_TYPE_TOILET = 22, // "I need to go to the toilet"
PEEP_THOUGHT_TYPE_CANT_FIND = 23, // "I can't find X"
PEEP_THOUGHT_TYPE_NOT_PAYING = 24, // "I'm not paying that much to use X"
PEEP_THOUGHT_TYPE_NOT_WHILE_RAINING = 25, // "I'm not going on X while it's raining"
@ -362,7 +362,7 @@ enum PeepFlags : uint32_t
PEEP_FLAGS_LITTER = (1 << 9), // Makes the peep throw litter
PEEP_FLAGS_LOST = (1 << 10), // Makes the peep feel lost (animation triggered)
PEEP_FLAGS_HUNGER = (1 << 11), // Makes the peep become hungry quicker
PEEP_FLAGS_BATHROOM = (1 << 12), // Makes the peep want to go to the bathroom
PEEP_FLAGS_TOILET = (1 << 12), // Makes the peep want to go to the toilet
PEEP_FLAGS_CROWDED = (1 << 13), // The peep will start feeling crowded
PEEP_FLAGS_HAPPINESS = (1 << 14), // The peep will start increasing happiness
PEEP_FLAGS_NAUSEA = (1 << 15), // Makes the peep feel sick (e.g. after an extreme ride)
@ -488,7 +488,7 @@ enum PeepSpriteType : uint8_t
PEEP_SPRITE_TYPE_HEAD_DOWN = 26,
PEEP_SPRITE_TYPE_NAUSEOUS = 27,
PEEP_SPRITE_TYPE_VERY_NAUSEOUS = 28,
PEEP_SPRITE_TYPE_REQUIRE_BATHROOM = 29,
PEEP_SPRITE_TYPE_REQUIRE_TOILET = 29,
PEEP_SPRITE_TYPE_HAT = 30,
PEEP_SPRITE_TYPE_HOT_DOG = 31,
PEEP_SPRITE_TYPE_TENTACLE = 32,

2
src/openrct2/rct1/RCT1.h
View File

@ -501,7 +501,7 @@ enum RCT1_PEEP_SPRITE_TYPE
RCT1_PEEP_SPRITE_TYPE_HEAD_DOWN = 23,
RCT1_PEEP_SPRITE_TYPE_NAUSEOUS = 24,
RCT1_PEEP_SPRITE_TYPE_VERY_NAUSEOUS = 25,
RCT1_PEEP_SPRITE_TYPE_REQUIRE_BATHROOM = 26,
RCT1_PEEP_SPRITE_TYPE_REQUIRE_TOILET = 26,
RCT1_PEEP_SPRITE_TYPE_HAT = 27,
RCT1_PEEP_SPRITE_TYPE_BURGER = 28,
RCT1_PEEP_SPRITE_TYPE_TENTACLE = 29,

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

@ -96,7 +96,7 @@ namespace RCT1
PEEP_SPRITE_TYPE_HEAD_DOWN, // 0x17
PEEP_SPRITE_TYPE_NAUSEOUS, // 0x18
PEEP_SPRITE_TYPE_VERY_NAUSEOUS, // 0x19
PEEP_SPRITE_TYPE_REQUIRE_BATHROOM, // 0x1A
PEEP_SPRITE_TYPE_REQUIRE_TOILET, // 0x1A
PEEP_SPRITE_TYPE_HAT, // 0x1B
PEEP_SPRITE_TYPE_HOT_DOG, // 0x1C
PEEP_SPRITE_TYPE_TENTACLE, // 0x1D

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

@ -668,7 +668,7 @@ enum : uint8_t
RIDE_MODE_UNLIMITED_RIDES_PER_ADMISSION = 10,
RIDE_MODE_MAZE,
RIDE_MODE_RACE,
RIDE_MODE_BUMPERCAR,
RIDE_MODE_DODGEMS,
RIDE_MODE_SWING,
RIDE_MODE_SHOP_STALL,
RIDE_MODE_ROTATION,

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

@ -257,7 +257,7 @@ constexpr const uint64_t AllRideModesAvailable = (1ULL << RIDE_MODE_CONTINUOUS_C
| (1ULL << RIDE_MODE_BOAT_HIRE) | (1ULL << RIDE_MODE_UPWARD_LAUNCH) | (1ULL << RIDE_MODE_ROTATING_LIFT)
| (1ULL << RIDE_MODE_STATION_TO_STATION) | (1ULL << RIDE_MODE_SINGLE_RIDE_PER_ADMISSION)
| (1ULL << RIDE_MODE_UNLIMITED_RIDES_PER_ADMISSION) | (1ULL << RIDE_MODE_MAZE) | (1ULL << RIDE_MODE_RACE)
| (1ULL << RIDE_MODE_BUMPERCAR) | (1ULL << RIDE_MODE_SWING) | (1ULL << RIDE_MODE_SHOP_STALL) | (1ULL << RIDE_MODE_ROTATION)
| (1ULL << RIDE_MODE_DODGEMS) | (1ULL << RIDE_MODE_SWING) | (1ULL << RIDE_MODE_SHOP_STALL) | (1ULL << RIDE_MODE_ROTATION)
| (1ULL << RIDE_MODE_FORWARD_ROTATION) | (1ULL << RIDE_MODE_BACKWARD_ROTATION) | (1ULL << RIDE_MODE_FILM_AVENGING_AVIATORS)
| (1ULL << RIDE_MODE_3D_FILM_MOUSE_TAILS) | (1ULL << RIDE_MODE_SPACE_RINGS) | (1ULL << RIDE_MODE_BEGINNERS)
| (1ULL << RIDE_MODE_LIM_POWERED_LAUNCH) | (1ULL << RIDE_MODE_FILM_THRILL_RIDERS)

2
src/openrct2/ride/Station.cpp
View File

@ -35,7 +35,7 @@ void ride_update_station(Ride* ride, StationIndex stationIndex)
case RIDE_MODE_RACE:
ride_update_station_race(ride, stationIndex);
break;
case RIDE_MODE_BUMPERCAR:
case RIDE_MODE_DODGEMS:
ride_update_station_bumpercar(ride, stationIndex);
break;
case RIDE_MODE_CONTINUOUS_CIRCUIT_BLOCK_SECTIONED:

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

@ -2069,7 +2069,7 @@ void Vehicle::UpdateMovingToEndOfStation()
if (!(curFlags & VEHICLE_UPDATE_MOTION_TRACK_FLAG_5))
break;
[[fallthrough]];
case RIDE_MODE_BUMPERCAR:
case RIDE_MODE_DODGEMS:
case RIDE_MODE_SWING:
case RIDE_MODE_ROTATION:
case RIDE_MODE_FORWARD_ROTATION:
@ -2551,7 +2551,7 @@ void Vehicle::UpdateWaitingToDepart()
switch (curRide->mode)
{
case RIDE_MODE_BUMPERCAR:
case RIDE_MODE_DODGEMS:
// Bumper mode uses sub_state / var_CE to tell how long
// the vehicle has been ridden.
SetState(VEHICLE_STATUS_TRAVELLING_DODGEMS);

4
src/openrct2/ride/gentle/meta/Dodgems.h
View File

@ -26,8 +26,8 @@ constexpr const RideTypeDescriptor DodgemsRTD =
RIDE_TYPE_FLAG_NO_TEST_MODE | RIDE_TYPE_FLAG_HAS_NO_TRACK | RIDE_TYPE_FLAG_TRACK_NO_WALLS | RIDE_TYPE_FLAG_FLAT_RIDE |
RIDE_TYPE_FLAG_HAS_VEHICLE_COLOURS | RIDE_TYPE_FLAG_MUSIC_ON_DEFAULT | RIDE_TYPE_FLAG_ALLOW_MUSIC |
RIDE_TYPE_FLAG_HAS_ENTRANCE_EXIT | RIDE_TYPE_FLAG_SLIGHTLY_INTERESTING_TO_LOOK_AT | RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY),
SET_FIELD(RideModes, (1ULL << RIDE_MODE_BUMPERCAR)),
SET_FIELD(DefaultMode, RIDE_MODE_BUMPERCAR),
SET_FIELD(RideModes, (1ULL << RIDE_MODE_DODGEMS)),
SET_FIELD(DefaultMode, RIDE_MODE_DODGEMS),
SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_CAR, RIDE_COMPONENT_TYPE_BUILDING, RIDE_COMPONENT_TYPE_STATION }),
SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT)),
SET_FIELD(LiftData, { SoundId::Null, 5, 5 }),

4
src/openrct2/ride/gentle/meta/FlyingSaucers.h
View File

@ -27,8 +27,8 @@ constexpr const RideTypeDescriptor FlyingSaucersRTD =
RIDE_TYPE_FLAG_TRACK_NO_WALLS | RIDE_TYPE_FLAG_FLAT_RIDE | RIDE_TYPE_FLAG_HAS_VEHICLE_COLOURS |
RIDE_TYPE_FLAG_MUSIC_ON_DEFAULT | RIDE_TYPE_FLAG_ALLOW_MUSIC | RIDE_TYPE_FLAG_HAS_ENTRANCE_EXIT |
RIDE_TYPE_FLAG_SINGLE_SESSION | RIDE_TYPE_FLAG_INTERESTING_TO_LOOK_AT | RIDE_TYPE_FLAG_LIST_VEHICLES_SEPARATELY),
SET_FIELD(RideModes, (1ULL << RIDE_MODE_BUMPERCAR)),
SET_FIELD(DefaultMode, RIDE_MODE_BUMPERCAR),
SET_FIELD(RideModes, (1ULL << RIDE_MODE_DODGEMS)),
SET_FIELD(DefaultMode, RIDE_MODE_DODGEMS),
SET_FIELD(NameConvention, { RIDE_COMPONENT_TYPE_CAR, RIDE_COMPONENT_TYPE_BUILDING, RIDE_COMPONENT_TYPE_STATION }),
SET_FIELD(AvailableBreakdowns, (1 << BREAKDOWN_SAFETY_CUT_OUT)),
SET_FIELD(LiftData, { SoundId::Null, 5, 5 }),