mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2026-01-30 10:15:36 +01:00
Code Issues Releases Wiki Activity

Part of #9473: Create Vehicle::GetTrackProgress

Browse Source
This commit is contained in:
hdpoliveira
2020-06-19 14:04:15 -03:00
parent f33f3c07bd
commit 0bdbcbcd88
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -797,7 +797,7 @@ const rct_vehicle_info* Vehicle::GetMoveInfo() const
return vehicle_get_move_info(TrackSubposition, track_type, track_progress);
}
uint16_t vehicle_get_move_info_size(int32_t trackSubposition, int32_t typeAndDirection)
static uint16_t vehicle_get_move_info_size(int32_t trackSubposition, int32_t typeAndDirection)
{
if (!vehicle_move_info_valid(trackSubposition, typeAndDirection, 0))
{
@@ -806,6 +806,11 @@ uint16_t vehicle_get_move_info_size(int32_t trackSubposition, int32_t typeAndDir
return gTrackVehicleInfo[trackSubposition][typeAndDirection]->size;
}
uint16_t Vehicle::GetTrackProgress() const
{
return vehicle_get_move_info_size(TrackSubposition, track_type);
}
Vehicle* try_get_vehicle(uint16_t spriteIndex)
{
rct_sprite* sprite = try_get_sprite(spriteIndex);
@@ -8230,7 +8235,7 @@ loc_6DAEB9:
regs.ax = track_progress + 1;
// Track Total Progress is in the two bytes before the move info list
uint16_t trackTotalProgress = vehicle_get_move_info_size(TrackSubposition, track_type);
uint16_t trackTotalProgress = GetTrackProgress();
if (regs.ax >= trackTotalProgress)
{
UpdateCrossings();
@@ -8515,7 +8520,7 @@ bool Vehicle::UpdateTrackMotionBackwardsGetNewTrack(uint16_t trackType, Ride* cu
brake_speed = tileElement->AsTrack()->GetBrakeBoosterSpeed();
// There are two bytes before the move info list
uint16_t trackTotalProgress = vehicle_get_move_info_size(TrackSubposition, track_type);
uint16_t trackTotalProgress = GetTrackProgress();
*progress = trackTotalProgress - 1;
return true;
}
@@ -8778,7 +8783,7 @@ loc_6DC476:
// There are two bytes before the move info list
{
uint16_t trackTotalProgress = vehicle_get_move_info_size(TrackSubposition, track_type);
uint16_t trackTotalProgress = GetTrackProgress();
if (track_progress + 1 < trackTotalProgress)
{
track_progress += 1;
@@ -9053,7 +9058,7 @@ loc_6DCA9A:
var_CF = tileElement->AsTrack()->GetSeatRotation() << 1;
// There are two bytes before the move info list
track_progress = vehicle_get_move_info_size(TrackSubposition, track_type);
track_progress = GetTrackProgress();
loc_6DCC2C:
moveInfo = GetMoveInfo();