From 406600977899795fbe68890c19bd6ba6c89a8ab2 Mon Sep 17 00:00:00 2001 From: Yaroslav Tretyakov Date: Tue, 9 Aug 2016 01:35:16 -0600 Subject: [PATCH] Fix #4253: Crash in vehicle_update_motion_collision_detection --- src/ride/vehicle.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ride/vehicle.c b/src/ride/vehicle.c index 8ec89b1e55..bee3dab67e 100644 --- a/src/ride/vehicle.c +++ b/src/ride/vehicle.c @@ -6778,6 +6778,8 @@ static bool vehicle_update_motion_collision_detection( if (z_diff > 16) continue; + if (collideVehicle->ride_subtype == RIDE_TYPE_NULL) continue; + rct_ride_entry_vehicle* collideType = vehicle_get_vehicle_entry(collideVehicle); if (!(collideType->flags_b & VEHICLE_ENTRY_FLAG_B_6)) continue; @@ -7166,7 +7168,6 @@ static bool vehicle_update_track_motion_forwards(rct_vehicle *vehicle, rct_ride_ loc_6DAEB9: regs.edi = vehicle->track_type; regs.cx = vehicle->track_type >> 2; - int trackType = vehicle->track_type >> 2; if (trackType == TRACK_ELEM_HEARTLINE_TRANSFER_UP || trackType == TRACK_ELEM_HEARTLINE_TRANSFER_DOWN) { if (vehicle->track_progress == 80) {