From b3101dd9b0f972ea62819171a4192062ea7c295c Mon Sep 17 00:00:00 2001 From: janisozaur Date: Sun, 15 May 2016 16:59:42 +0200 Subject: [PATCH] Don't crash when vehicles have 0 friction (#3615) --- src/ride/vehicle.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/ride/vehicle.c b/src/ride/vehicle.c index 9ef8bc5f1d..f67bba93cf 100644 --- a/src/ride/vehicle.c +++ b/src/ride/vehicle.c @@ -8168,7 +8168,10 @@ int vehicle_update_track_motion(rct_vehicle *vehicle, int *outStation) } regs.edx >>= 4; regs.eax = regs.edx; - regs.eax = regs.eax / totalFriction; + // OpenRCT2: vehicles from different track types can have 0 friction. + if (totalFriction != 0) { + regs.eax = regs.eax / totalFriction; + } regs.ecx -= regs.eax; if (!(vehicleEntry->flags_b & VEHICLE_ENTRY_FLAG_B_3)) {