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

Remove usage of regs.si (#11899) 

esi was also looked at - it wasn't used.
This commit is contained in:
Michael Steenbeek 2020-06-08 00:56:23 +02:00 committed by GitHub
parent 71531445bb
commit 5fc414eaf6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9304,12 +9304,12 @@ loc_6DCEB2:
}
if (_vehicleVelocityF64E08 >= 0)
{
regs.si = vehicle->next_vehicle_on_train;
if (static_cast<uint16_t>(regs.si) == SPRITE_INDEX_NULL)
auto nextVehicleIndex = vehicle->next_vehicle_on_train;
if (nextVehicleIndex == SPRITE_INDEX_NULL)
{
goto loc_6DCEFF;
}
vehicle = GET_VEHICLE(static_cast<uint16_t>(regs.si));
vehicle = GET_VEHICLE(nextVehicleIndex);
goto loc_6DC40E;
}
@ -9333,12 +9333,12 @@ loc_6DCEFF:
regs.dx |= vehicle->update_flags;
totalMass += vehicle->mass;
regs.eax += vehicle->acceleration;
regs.si = vehicle->next_vehicle_on_train;
if (static_cast<uint16_t>(regs.si) == SPRITE_INDEX_NULL)
auto nextVehicleIndex = vehicle->next_vehicle_on_train;
if (nextVehicleIndex == SPRITE_INDEX_NULL)
{
break;
}
vehicle = GET_VEHICLE(static_cast<uint16_t>(regs.si));
vehicle = GET_VEHICLE(nextVehicleIndex);
}
vehicle = gCurrentVehicle;