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

Fix #4253: Crash in vehicle_update_motion_collision_detection

This commit is contained in:
Yaroslav Tretyakov 2016-08-09 01:35:16 -06:00 committed by Ted John
parent a7454d6d88
commit 4066009778
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ride/vehicle.c
View File

@ -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) {