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

quick removing this

This commit is contained in:
spacek531 2021-08-21 21:53:29 -07:00
parent 6d7fd57f5b
commit 199de52afe
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5520,6 +5520,7 @@ void Vehicle::UpdateCrash()
curVehicle->Invalidate(); curVehicle->Invalidate();
} }
curVehicle->animationState += 7281; curVehicle->animationState += 7281;
curVehicle->animationState &= 0xFFFF;
continue; continue;
} }
@ -7318,7 +7319,6 @@ void Vehicle::UpdateAdditionalAnimation()
uint8_t curFrame{}; uint8_t curFrame{};
uint32_t eax{}; uint32_t eax{};
uint32_t* curAnimationState = reinterpret_cast<uint32_t*>(&animationState);
auto vehicleEntry = Entry(); auto vehicleEntry = Entry();
if (vehicleEntry == nullptr) if (vehicleEntry == nullptr)
{ {
@ -7327,8 +7327,8 @@ void Vehicle::UpdateAdditionalAnimation()
switch (vehicleEntry->animation) switch (vehicleEntry->animation)
{ {
case VEHICLE_ENTRY_ANIMATION_MINITURE_RAILWAY_LOCOMOTIVE: // loc_6D652B case VEHICLE_ENTRY_ANIMATION_MINITURE_RAILWAY_LOCOMOTIVE: // loc_6D652B
*curAnimationState += _vehicleVelocityF64E08; animationState += _vehicleVelocityF64E08;
targetFrame = (*curAnimationState >> 20) & 3; targetFrame = (animationState >> 20) & 3;
if (animation_frame != targetFrame) if (animation_frame != targetFrame)
{ {
curFrame = animation_frame; curFrame = animation_frame;
@ -7366,8 +7366,8 @@ void Vehicle::UpdateAdditionalAnimation()
} }
break; break;
case VEHICLE_ENTRY_ANIMATION_SWAN: // loc_6D6424 case VEHICLE_ENTRY_ANIMATION_SWAN: // loc_6D6424
*curAnimationState += _vehicleVelocityF64E08; animationState += _vehicleVelocityF64E08;
targetFrame = (*curAnimationState >> 18) & 2; targetFrame = (animationState >> 18) & 2;
if (animation_frame != targetFrame) if (animation_frame != targetFrame)
{ {
animation_frame = targetFrame; animation_frame = targetFrame;
@ -7375,8 +7375,8 @@ void Vehicle::UpdateAdditionalAnimation()
} }
break; break;
case VEHICLE_ENTRY_ANIMATION_CANOES: // loc_6D6482 case VEHICLE_ENTRY_ANIMATION_CANOES: // loc_6D6482
*curAnimationState += _vehicleVelocityF64E08; animationState += _vehicleVelocityF64E08;
eax = ((*curAnimationState >> 13) & 0xFF) * 6; eax = ((animationState >> 13) & 0xFF) * 6;
targetFrame = (eax >> 8) & 0xFF; targetFrame = (eax >> 8) & 0xFF;
if (animation_frame != targetFrame) if (animation_frame != targetFrame)
{ {
@ -7385,8 +7385,8 @@ void Vehicle::UpdateAdditionalAnimation()
} }
break; break;
case VEHICLE_ENTRY_ANIMATION_ROW_BOATS: // loc_6D64F7 case VEHICLE_ENTRY_ANIMATION_ROW_BOATS: // loc_6D64F7
*curAnimationState += _vehicleVelocityF64E08; animationState += _vehicleVelocityF64E08;
eax = ((*curAnimationState >> 13) & 0xFF) * 7; eax = ((animationState >> 13) & 0xFF) * 7;
targetFrame = (eax >> 8) & 0xFF; targetFrame = (eax >> 8) & 0xFF;
if (animation_frame != targetFrame) if (animation_frame != targetFrame)
{ {
@ -7395,8 +7395,8 @@ void Vehicle::UpdateAdditionalAnimation()
} }
break; break;
case VEHICLE_ENTRY_ANIMATION_WATER_TRICYCLES: // loc_6D6453 case VEHICLE_ENTRY_ANIMATION_WATER_TRICYCLES: // loc_6D6453
*curAnimationState += _vehicleVelocityF64E08; animationState += _vehicleVelocityF64E08;
targetFrame = (*curAnimationState >> 19) & 1; targetFrame = (animationState >> 19) & 1;
if (animation_frame != targetFrame) if (animation_frame != targetFrame)
{ {
animation_frame = targetFrame; animation_frame = targetFrame;
@ -7417,8 +7417,8 @@ void Vehicle::UpdateAdditionalAnimation()
} }
break; break;
case VEHICLE_ENTRY_ANIMATION_HELICARS: // loc_6D63F5 case VEHICLE_ENTRY_ANIMATION_HELICARS: // loc_6D63F5
*curAnimationState += _vehicleVelocityF64E08; animationState += _vehicleVelocityF64E08;
targetFrame = (*curAnimationState >> 18) & 3; targetFrame = (animationState >> 18) & 3;
if (animation_frame != targetFrame) if (animation_frame != targetFrame)
{ {
animation_frame = targetFrame; animation_frame = targetFrame;
@ -7428,8 +7428,8 @@ void Vehicle::UpdateAdditionalAnimation()
case VEHICLE_ENTRY_ANIMATION_MONORAIL_CYCLES: // loc_6D64B6 case VEHICLE_ENTRY_ANIMATION_MONORAIL_CYCLES: // loc_6D64B6
if (num_peeps != 0) if (num_peeps != 0)
{ {
*curAnimationState += _vehicleVelocityF64E08; animationState += _vehicleVelocityF64E08;
eax = ((*curAnimationState >> 13) & 0xFF) << 2; eax = ((animationState >> 13) & 0xFF) << 2;
targetFrame = (eax >> 8) & 0xFF; targetFrame = (eax >> 8) & 0xFF;
if (animation_frame != targetFrame) if (animation_frame != targetFrame)
{ {