diff options
author | rubidium <rubidium@openttd.org> | 2007-10-19 22:46:55 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2007-10-19 22:46:55 +0000 |
commit | 95f2181a1dbd2ac1276bf3e044d6d9161b96ed50 (patch) | |
tree | 94325422edf35b6645a697ffa3bfd15ed090bf01 /src/vehicle.cpp | |
parent | 9371ac13078df51aa920ecaa99485b0b4081513a (diff) | |
download | openttd-95f2181a1dbd2ac1276bf3e044d6d9161b96ed50.tar.xz |
(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.
Diffstat (limited to 'src/vehicle.cpp')
-rw-r--r-- | src/vehicle.cpp | 14 |
1 files changed, 0 insertions, 14 deletions
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; |