From 216836cd1276ad40cd5893f5e0b30092703ecb94 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C5=82=20Janiszewski?= Date: Mon, 30 Oct 2017 10:21:26 +0100 Subject: [PATCH] Remove unnecessary condition It is impossible for two positive integers, each <= 0x7fff, to form a sum larger than 0xffff --- src/openrct2/ride/Vehicle.cpp | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/openrct2/ride/Vehicle.cpp b/src/openrct2/ride/Vehicle.cpp index dfcfbd6493..4e8e922ee4 100644 --- a/src/openrct2/ride/Vehicle.cpp +++ b/src/openrct2/ride/Vehicle.cpp @@ -7613,9 +7613,6 @@ static bool vehicle_update_motion_collision_detection(rct_vehicle * vehicle, sin if (y_diff > 0x7FFF) return false; - if (x_diff + y_diff > 0xFFFF) - return false; - sint32 z_diff = abs(z - collideVehicle->z); if (x_diff + y_diff + z_diff > 0xFFFF) return false; @@ -7674,9 +7671,6 @@ static bool vehicle_update_motion_collision_detection(rct_vehicle * vehicle, sin if (y_diff > 0x7FFF) continue; - if (x_diff + y_diff > 0xFFFF) - continue; - uint8 cl = Math::Min(vehicle->var_CD, collideVehicle->var_CD); uint8 ch = Math::Max(vehicle->var_CD, collideVehicle->var_CD); if (cl != ch)