mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-24 08:12:53 +01:00
Code Issues Releases Wiki Activity

Part of #9473: vehicle_update_space_rings_operating to Vehicle::UpdateSpaceRingsOperating

Browse Source
This commit is contained in:
hdpoliveira
2020-04-10 03:43:58 -03:00
parent 20ddfda72c
commit a4a2106d28
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,7 +54,6 @@ static void vehicle_update_departing(Vehicle* vehicle);
static void vehicle_finish_departing(Vehicle* vehicle);
static void vehicle_update_travelling(Vehicle* vehicle);
static void vehicle_update_rotating(Vehicle* vehicle);
static void vehicle_update_space_rings_operating(Vehicle* vehicle);
static void vehicle_update_haunted_house_operating(Vehicle* vehicle);
static void vehicle_update_crooked_house_operating(Vehicle* vehicle);
static void vehicle_update_travelling_boat(Vehicle* vehicle);
@@ -2017,7 +2016,7 @@ void Vehicle::Update()
UpdateFerrisWheelRotating();
break;
case VEHICLE_STATUS_SPACE_RINGS_OPERATING:
vehicle_update_space_rings_operating(this);
UpdateSpaceRingsOperating();
break;
case VEHICLE_STATUS_HAUNTED_HOUSE_OPERATING:
vehicle_update_haunted_house_operating(this);
@@ -2661,7 +2660,7 @@ void Vehicle::UpdateWaitingToDepart()
SetState(VEHICLE_STATUS_SPACE_RINGS_OPERATING);
vehicle_sprite_type = 0;
current_time = -1;
vehicle_update_space_rings_operating(this);
UpdateSpaceRingsOperating();
break;
case RIDE_MODE_HAUNTED_HOUSE:
SetState(VEHICLE_STATUS_HAUNTED_HOUSE_OPERATING);
@@ -4960,25 +4959,25 @@ static void vehicle_update_rotating(Vehicle* vehicle)
*
* rct2: 0x006D97CB
*/
static void vehicle_update_space_rings_operating(Vehicle* vehicle)
void Vehicle::UpdateSpaceRingsOperating()
{
if (_vehicleBreakdown == 0)
return;
uint8_t spriteType = SpaceRingsTimeToSpriteMap[vehicle->current_time + 1];
uint8_t spriteType = SpaceRingsTimeToSpriteMap[current_time + 1];
if (spriteType != 255)
{
vehicle->current_time++;
if (spriteType != vehicle->vehicle_sprite_type)
current_time++;
if (spriteType != vehicle_sprite_type)
{
vehicle->vehicle_sprite_type = spriteType;
vehicle->Invalidate();
vehicle_sprite_type = spriteType;
Invalidate();
}
}
else
{
vehicle->SetState(VEHICLE_STATUS_ARRIVING);
vehicle->var_C0 = 0;
SetState(VEHICLE_STATUS_ARRIVING);
var_C0 = 0;
}
}

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

@@ -317,6 +317,7 @@ private:
void UpdateSimulatorOperating();
void UpdateTopSpinOperating();
void UpdateFerrisWheelRotating();
void UpdateSpaceRingsOperating();
};
struct train_ref