(svn r11639) -Codechange: simplify EnsureNoVehicleOnGround

pull/155/head
smatz 17 years ago
parent 13c11e9af6
commit f13a60b90c

@ -129,16 +129,6 @@ static void *EnsureNoVehicleProcZ(Vehicle *v, void *data)
return v; 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) Vehicle *FindVehicleOnTileZ(TileIndex tile, byte z)
{ {
TileInfo ti; TileInfo ti;
@ -149,6 +139,11 @@ Vehicle *FindVehicleOnTileZ(TileIndex tile, byte z)
return (Vehicle*)VehicleFromPos(tile, &ti, EnsureNoVehicleProcZ); 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) Vehicle *FindVehicleBetween(TileIndex from, TileIndex to, byte z, bool without_crashed)
{ {
int x1 = TileX(from); int x1 = TileX(from);

Loading…
Cancel
Save