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

Part of #9473: vehicle_update_doing_circus_show to Vehicle::UpdateDoingCircusShow

This commit is contained in:
hdpoliveira 2020-04-10 04:29:38 -03:00
parent 3d673e7d5d
commit 32b3448b92
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -48,7 +48,6 @@
static void vehicle_update_crossings(const Vehicle* vehicle); static void vehicle_update_crossings(const Vehicle* vehicle);
static void vehicle_claxon(const Vehicle* vehicle); static void vehicle_claxon(const Vehicle* vehicle);
static void vehicle_update_doing_circus_show(Vehicle* vehicle);
static void vehicle_finish_departing(Vehicle* vehicle); static void vehicle_finish_departing(Vehicle* vehicle);
static void vehicle_update_motion_boat_hire(Vehicle* vehicle); static void vehicle_update_motion_boat_hire(Vehicle* vehicle);
static void vehicle_update_boat_location(Vehicle* vehicle); static void vehicle_update_boat_location(Vehicle* vehicle);
@ -2041,7 +2040,7 @@ void Vehicle::Update()
UpdateShowingFilm(); UpdateShowingFilm();
break; break;
case VEHICLE_STATUS_DOING_CIRCUS_SHOW: case VEHICLE_STATUS_DOING_CIRCUS_SHOW:
vehicle_update_doing_circus_show(this); UpdateDoingCircusShow();
default: default:
break; break;
} }
@ -2643,7 +2642,7 @@ void Vehicle::UpdateWaitingToDepart()
case RIDE_MODE_CIRCUS_SHOW: case RIDE_MODE_CIRCUS_SHOW:
SetState(VEHICLE_STATUS_DOING_CIRCUS_SHOW); SetState(VEHICLE_STATUS_DOING_CIRCUS_SHOW);
current_time = -1; current_time = -1;
vehicle_update_doing_circus_show(this); UpdateDoingCircusShow();
break; break;
case RIDE_MODE_SPACE_RINGS: case RIDE_MODE_SPACE_RINGS:
SetState(VEHICLE_STATUS_SPACE_RINGS_OPERATING); SetState(VEHICLE_STATUS_SPACE_RINGS_OPERATING);
@ -5105,20 +5104,20 @@ void Vehicle::UpdateShowingFilm()
* *
* rct2: 0x006D95F7 * rct2: 0x006D95F7
*/ */
static void vehicle_update_doing_circus_show(Vehicle* vehicle) void Vehicle::UpdateDoingCircusShow()
{ {
if (_vehicleBreakdown == 0) if (_vehicleBreakdown == 0)
return; return;
int32_t currentTime = vehicle->current_time + 1; int32_t currentTime = current_time + 1;
if (currentTime <= 5000) if (currentTime <= 5000)
{ {
vehicle->current_time = currentTime; current_time = currentTime;
} }
else else
{ {
vehicle->SetState(VEHICLE_STATUS_ARRIVING); SetState(VEHICLE_STATUS_ARRIVING);
vehicle->var_C0 = 0; var_C0 = 0;
} }
} }

1
src/openrct2/ride/Vehicle.h
View File

@ -329,6 +329,7 @@ private:
void UpdateUnloadingPassengers(); void UpdateUnloadingPassengers();
void UpdateWaitingForCableLift(); void UpdateWaitingForCableLift();
void UpdateShowingFilm(); void UpdateShowingFilm();
void UpdateDoingCircusShow();
}; };
struct train_ref struct train_ref