mirror of https://github.com/OpenRCT2/OpenRCT2.git
Integrate loc_6DB967
This commit is contained in:
parent
c200d7ab9c
commit
7e50d1bbc5
|
@ -8354,24 +8354,6 @@ loc_6DAEB9:
|
||||||
otherVehicleIndex = prev_vehicle_on_ride;
|
otherVehicleIndex = prev_vehicle_on_ride;
|
||||||
if (UpdateMotionCollisionDetection(loc, &otherVehicleIndex))
|
if (UpdateMotionCollisionDetection(loc, &otherVehicleIndex))
|
||||||
{
|
{
|
||||||
goto loc_6DB967;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// loc_6DB928
|
|
||||||
if (remaining_distance < 0x368A)
|
|
||||||
{
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
regs.ebx = dword_9A2970[regs.ebx];
|
|
||||||
acceleration += regs.ebx;
|
|
||||||
_vehicleUnkF64E10++;
|
|
||||||
goto loc_6DAEB9;
|
|
||||||
|
|
||||||
loc_6DB967:
|
|
||||||
_vehicleVelocityF64E0C -= remaining_distance + 1;
|
_vehicleVelocityF64E0C -= remaining_distance + 1;
|
||||||
remaining_distance = -1;
|
remaining_distance = -1;
|
||||||
|
|
||||||
|
@ -8409,6 +8391,21 @@ loc_6DB967:
|
||||||
}
|
}
|
||||||
_vehicleMotionTrackFlags |= VEHICLE_UPDATE_MOTION_TRACK_FLAG_1;
|
_vehicleMotionTrackFlags |= VEHICLE_UPDATE_MOTION_TRACK_FLAG_1;
|
||||||
return false;
|
return false;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// loc_6DB928
|
||||||
|
if (remaining_distance < 0x368A)
|
||||||
|
{
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
regs.ebx = dword_9A2970[regs.ebx];
|
||||||
|
acceleration += regs.ebx;
|
||||||
|
_vehicleUnkF64E10++;
|
||||||
|
goto loc_6DAEB9;
|
||||||
}
|
}
|
||||||
|
|
||||||
static PitchAndRoll PitchAndRollEnd(Ride* curRide, bool useInvertedSprites, uint16_t trackType, TileElement* tileElement)
|
static PitchAndRoll PitchAndRollEnd(Ride* curRide, bool useInvertedSprites, uint16_t trackType, TileElement* tileElement)
|
||||||
|
|
Loading…
Reference in New Issue