From 95f2181a1dbd2ac1276bf3e044d6d9161b96ed50 Mon Sep 17 00:00:00 2001 From: rubidium Date: Fri, 19 Oct 2007 22:46:55 +0000 Subject: (svn r11303) -Fix: EnsureNoVehicle and EnsureNoVehicleOnGround were both used to check whether there was no vehicle on the ground, except that the former didn't take care of aircraft shadows. So now we only use EnsureNoVehicleOnGround. --- src/vehicle.cpp | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'src/vehicle.cpp') diff --git a/src/vehicle.cpp b/src/vehicle.cpp index 56ce50b5d..21c8996f1 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -117,20 +117,6 @@ StringID VehicleInTheWayErrMsg(const Vehicle* v) } } -static void *EnsureNoVehicleProc(Vehicle *v, void *data) -{ - if (v->tile != *(const TileIndex*)data || v->type == VEH_DISASTER || (v->type == VEH_AIRCRAFT && v->subtype == AIR_SHADOW)) - return NULL; - - _error_message = VehicleInTheWayErrMsg(v); - return v; -} - -bool EnsureNoVehicle(TileIndex tile) -{ - return VehicleFromPos(tile, &tile, EnsureNoVehicleProc) == NULL; -} - static void *EnsureNoVehicleProcZ(Vehicle *v, void *data) { const TileInfo *ti = (const TileInfo*)data; -- cgit v1.2.3-54-g00ecf