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

set value to 0

This commit is contained in:
spacek531 2021-08-22 21:44:04 -07:00
parent 199de52afe
commit 315070faaa
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1522,16 +1522,16 @@ bool Vehicle::OpenRestraints()
} }
if (vehicleEntry->animation == VEHICLE_ENTRY_ANIMATION_OBSERVATION_TOWER && vehicle->animation_frame != 0) if (vehicleEntry->animation == VEHICLE_ENTRY_ANIMATION_OBSERVATION_TOWER && vehicle->animation_frame != 0)
{ {
if (vehicle->animationState + 0x3333 < 0xFFFF) if (vehicle->animationState <= 0xCCCC)
{ {
vehicle->animationState = vehicle->animationState + 0x3333 - 0xFFFF; vehicle->animationState += 0x3333;
vehicle->animation_frame++;
vehicle->animation_frame &= 7;
vehicle->Invalidate();
} }
else else
{ {
vehicle->animationState += 0x3333; vehicle->animationState = 0;
vehicle->animation_frame++;
vehicle->animation_frame &= 7;
vehicle->Invalidate();
} }
restraintsOpen = false; restraintsOpen = false;
continue; continue;
@ -5512,15 +5512,18 @@ void Vehicle::UpdateCrash()
ExplosionCloud::Create({ curVehicle->x + xOffset, curVehicle->y + yOffset, curVehicle->z }); ExplosionCloud::Create({ curVehicle->x + xOffset, curVehicle->y + yOffset, curVehicle->z });
} }
} }
if (curVehicle->animationState + 7281 > 0xFFFF) if (curVehicle->animationState <= 58248)
{ {
curVehicle->animationState += 7281;
}
else
{
curVehicle->animationState = 0;
curVehicle->animation_frame++; curVehicle->animation_frame++;
if (curVehicle->animation_frame >= 8) if (curVehicle->animation_frame >= 8)
curVehicle->animation_frame = 0; curVehicle->animation_frame = 0;
curVehicle->Invalidate(); curVehicle->Invalidate();
} }
curVehicle->animationState += 7281;
curVehicle->animationState &= 0xFFFF;
continue; continue;
} }
@ -7410,7 +7413,7 @@ void Vehicle::UpdateAdditionalAnimation()
} }
else else
{ {
animationState += 0x3333; animationState = 0;
animation_frame += 1; animation_frame += 1;
animation_frame &= 7; animation_frame &= 7;
Invalidate(); Invalidate();
@ -7447,7 +7450,7 @@ void Vehicle::UpdateAdditionalAnimation()
} }
else else
{ {
animationState += 0x3333; animationState = 0;
if (seat_rotation >= target_seat_rotation) if (seat_rotation >= target_seat_rotation)
seat_rotation--; seat_rotation--;