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

Replace 'bumper cars' with 'dodgems'

Browse Source
This commit is contained in:
Gymnasiast
2020-06-17 18:13:00 +02:00
parent 9e702d9e01
commit f0872ab7b8
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,7 +15,7 @@
#include "Track.h"
static void ride_update_station_blocksection(Ride* ride, StationIndex stationIndex);
static void ride_update_station_bumpercar(Ride* ride, StationIndex stationIndex);
static void ride_update_station_dodgems(Ride* ride, StationIndex stationIndex);
static void ride_update_station_normal(Ride* ride, StationIndex stationIndex);
static void ride_update_station_race(Ride* ride, StationIndex stationIndex);
static void ride_race_init_vehicle_speeds(Ride* ride);
@@ -36,7 +36,7 @@ void ride_update_station(Ride* ride, StationIndex stationIndex)
ride_update_station_race(ride, stationIndex);
break;
case RIDE_MODE_DODGEMS:
ride_update_station_bumpercar(ride, stationIndex);
ride_update_station_dodgems(ride, stationIndex);
break;
case RIDE_MODE_CONTINUOUS_CIRCUIT_BLOCK_SECTIONED:
case RIDE_MODE_POWERED_LAUNCH_BLOCK_SECTIONED:
@@ -83,7 +83,7 @@ static void ride_update_station_blocksection(Ride* ride, StationIndex stationInd
*
* rct2: 0x006AC12B
*/
static void ride_update_station_bumpercar(Ride* ride, StationIndex stationIndex)
static void ride_update_station_dodgems(Ride* ride, StationIndex stationIndex)
{
// Change of station depart flag should really call invalidate_station_start
// but since dodgems do not have station lights there is no point.

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

@@ -2487,7 +2487,7 @@ void Vehicle::UpdateDodgemsMode()
UpdateMotionDodgems();
// Update the length of time vehicle has been in bumper mode
// Update the length of time vehicle has been in dodgems mode
if (sub_state++ == 0xFF)
{
var_CE++;
@@ -2613,7 +2613,7 @@ void Vehicle::UpdateWaitingToDepart()
switch (curRide->mode)
{
case RIDE_MODE_DODGEMS:
// Bumper mode uses sub_state / var_CE to tell how long
// Dodgems mode uses sub_state / var_CE to tell how long
// the vehicle has been ridden.
SetState(VEHICLE_STATUS_TRAVELLING_DODGEMS);
var_CE = 0;