Mercurial > hg > openttd
changeset 2871:c11ce2756811 draft
(svn r3419) - Fix: [FS#40] (Possible) game crash on removing track/road under bridge. This was caused by a wrong tile-occupancy testing where it was assumed that a vehicle's height is only a multitude of 8 (a single height-difference). This is incorrect as a vehicle on a slope will assume all height levels between the lower-and upper-bounds. The crash is still possible as seen in the Flyspray bugreport but this has a different cause.
author | Darkvater <Darkvater@openttd.org> |
---|---|
date | Sun, 22 Jan 2006 17:17:11 +0000 |
parents | f70829943e6d |
children | 83692a2b2bd2 |
files | vehicle.c |
diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/vehicle.c +++ b/vehicle.c @@ -128,8 +128,8 @@ { const TileInfo *ti = data; - if (v->tile != ti->tile || v->z_pos != ti->z || v->type == VEH_Disaster) - return NULL; + if (v->tile != ti->tile || v->type == VEH_Disaster) return NULL; + if (v->z_pos != ti->z && abs(ti->z - v->z_pos) >= 8) return NULL; VehicleInTheWayErrMsg(v); return v; @@ -151,8 +151,8 @@ { TileInfo ti; - FindLandscapeHeightByTile(&ti, tile); - ti.z = z + Correct_Z(ti.tileh); + ti.tile = tile; + ti.z = z + GetCorrectTileHeight(tile); return VehicleFromPos(tile, &ti, EnsureNoVehicleProcZ) == NULL; }