mirrors/OpenRCT2
1
0
Fork 0
mirror of https://github.com/OpenRCT2/OpenRCT2 synced 2025-12-23 15:52:55 +01:00
Code Issues Releases Wiki Activity

Integrate loc_6DBE7F

Browse Source
This commit is contained in:
Gymnasiast
2021-01-17 19:38:36 +01:00
parent 60b0ba809a
commit c200d7ab9c
1 changed files with 35 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -8672,23 +8672,6 @@ loc_6DBA33:;
otherVehicleIndex = next_vehicle_on_ride; otherVehicleIndex = next_vehicle_on_ride;
if (UpdateMotionCollisionDetection(loc, &otherVehicleIndex)) if (UpdateMotionCollisionDetection(loc, &otherVehicleIndex))
{ {
goto loc_6DBE7F;
}
}
}
}
// loc_6DBE3F
if (remaining_distance >= 0)
{
return true;
}
regs.ebx = dword_9A2970[moveInfoVehicleSpriteType];
acceleration += regs.ebx;
_vehicleUnkF64E10++;
goto loc_6DBA33;
loc_6DBE7F:
_vehicleVelocityF64E0C -= remaining_distance - 0x368A; _vehicleVelocityF64E0C -= remaining_distance - 0x368A;
remaining_distance = 0x368A; remaining_distance = 0x368A;
@@ -8725,6 +8708,20 @@ loc_6DBE7F:
return false; return false;
} }
}
}
}
// loc_6DBE3F
if (remaining_distance >= 0)
{
return true;
}
regs.ebx = dword_9A2970[moveInfoVehicleSpriteType];
acceleration += regs.ebx;
_vehicleUnkF64E10++;
goto loc_6DBA33;
}
/** /**
* rct2: 0x006DC3A7 * rct2: 0x006DC3A7