mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2.git synced 2025-01-24 03:12:03 -05:00
Code Issues Projects Releases Packages Wiki Activity

Remove usage of regs.edi and regs.di (#11897)

Browse source 
regs.edi was only ever written to, not read. regs.di was written to twice, but only used on the next respective line.
This commit is contained in:
Michael Steenbeek 2020-06-08 00:06:52 +02:00 • committed by GitHub
parent a0c6752ff3
commit 71531445bb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/openrct2/ride/Vehicle.cpp
View file

@ -8155,7 +8155,6 @@ bool Vehicle::UpdateTrackMotionForwards(rct_ride_entry_vehicle* vehicleEntry, Ri
registers regs = {};
uint16_t otherVehicleIndex = SPRITE_INDEX_NULL;
loc_6DAEB9:
regs.edi = track_type;
regs.cx = GetTrackType();
int32_t trackType = GetTrackType();
if (trackType == TRACK_ELEM_HEARTLINE_TRANSFER_UP || trackType == TRACK_ELEM_HEARTLINE_TRANSFER_DOWN)
@ -8767,8 +8766,8 @@ loc_6DC476:
if (vehicle->mini_golf_flags & (1 << 0))
{
regs.di = vehicle->IsHead() ? vehicle->next_vehicle_on_ride : vehicle->prev_vehicle_on_ride;
Vehicle* vEDI = GET_VEHICLE(regs.di);
auto vehicleIdx = vehicle->IsHead() ? vehicle->next_vehicle_on_ride : vehicle->prev_vehicle_on_ride;
Vehicle* vEDI = GET_VEHICLE(vehicleIdx);
if (!(vEDI->mini_golf_flags & (1 << 0)) || (vEDI->mini_golf_flags & (1 << 2)))
{
goto loc_6DC985;
@ -8783,8 +8782,8 @@ loc_6DC476:
if (vehicle->mini_golf_flags & (1 << 1))
{
regs.di = vehicle->IsHead() ? vehicle->next_vehicle_on_ride : vehicle->prev_vehicle_on_ride;
Vehicle* vEDI = GET_VEHICLE(regs.di);
auto vehicleIdx = vehicle->IsHead() ? vehicle->next_vehicle_on_ride : vehicle->prev_vehicle_on_ride;
Vehicle* vEDI = GET_VEHICLE(vehicleIdx);
if (!(vEDI->mini_golf_flags & (1 << 1)) || (vEDI->mini_golf_flags & (1 << 2)))
{
goto loc_6DC985;