From 701e9d27fc964a5c6f35efb44e0605fd59ee9659 Mon Sep 17 00:00:00 2001 From: smatz Date: Sat, 15 Dec 2007 20:30:43 +0000 Subject: [PATCH] (svn r11639) -Codechange: simplify EnsureNoVehicleOnGround --- src/vehicle.cpp | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/src/vehicle.cpp b/src/vehicle.cpp index 63ffc09274..8074a08b4b 100644 --- a/src/vehicle.cpp +++ b/src/vehicle.cpp @@ -129,16 +129,6 @@ static void *EnsureNoVehicleProcZ(Vehicle *v, void *data) return v; } - -bool EnsureNoVehicleOnGround(TileIndex tile) -{ - TileInfo ti; - - ti.tile = tile; - ti.z = GetTileMaxZ(tile); - return VehicleFromPos(tile, &ti, EnsureNoVehicleProcZ) == NULL; -} - Vehicle *FindVehicleOnTileZ(TileIndex tile, byte z) { TileInfo ti; @@ -149,6 +139,11 @@ Vehicle *FindVehicleOnTileZ(TileIndex tile, byte z) return (Vehicle*)VehicleFromPos(tile, &ti, EnsureNoVehicleProcZ); } +bool EnsureNoVehicleOnGround(TileIndex tile) +{ + return FindVehicleOnTileZ(tile, GetTileMaxZ(tile)) == NULL; +} + Vehicle *FindVehicleBetween(TileIndex from, TileIndex to, byte z, bool without_crashed) { int x1 = TileX(from);