mirror of https://github.com/OpenRCT2/OpenRCT2.git
Replace 'bumper cars' with 'dodgems'
This commit is contained in:
parent
9e702d9e01
commit
f0872ab7b8
|
@ -15,7 +15,7 @@
|
||||||
#include "Track.h"
|
#include "Track.h"
|
||||||
|
|
||||||
static void ride_update_station_blocksection(Ride* ride, StationIndex stationIndex);
|
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_normal(Ride* ride, StationIndex stationIndex);
|
||||||
static void ride_update_station_race(Ride* ride, StationIndex stationIndex);
|
static void ride_update_station_race(Ride* ride, StationIndex stationIndex);
|
||||||
static void ride_race_init_vehicle_speeds(Ride* ride);
|
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);
|
ride_update_station_race(ride, stationIndex);
|
||||||
break;
|
break;
|
||||||
case RIDE_MODE_DODGEMS:
|
case RIDE_MODE_DODGEMS:
|
||||||
ride_update_station_bumpercar(ride, stationIndex);
|
ride_update_station_dodgems(ride, stationIndex);
|
||||||
break;
|
break;
|
||||||
case RIDE_MODE_CONTINUOUS_CIRCUIT_BLOCK_SECTIONED:
|
case RIDE_MODE_CONTINUOUS_CIRCUIT_BLOCK_SECTIONED:
|
||||||
case RIDE_MODE_POWERED_LAUNCH_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
|
* 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
|
// Change of station depart flag should really call invalidate_station_start
|
||||||
// but since dodgems do not have station lights there is no point.
|
// but since dodgems do not have station lights there is no point.
|
||||||
|
|
|
@ -2487,7 +2487,7 @@ void Vehicle::UpdateDodgemsMode()
|
||||||
|
|
||||||
UpdateMotionDodgems();
|
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)
|
if (sub_state++ == 0xFF)
|
||||||
{
|
{
|
||||||
var_CE++;
|
var_CE++;
|
||||||
|
@ -2613,7 +2613,7 @@ void Vehicle::UpdateWaitingToDepart()
|
||||||
switch (curRide->mode)
|
switch (curRide->mode)
|
||||||
{
|
{
|
||||||
case RIDE_MODE_DODGEMS:
|
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.
|
// the vehicle has been ridden.
|
||||||
SetState(VEHICLE_STATUS_TRAVELLING_DODGEMS);
|
SetState(VEHICLE_STATUS_TRAVELLING_DODGEMS);
|
||||||
var_CE = 0;
|
var_CE = 0;
|
||||||
|
|
Loading…
Reference in New Issue