From 95541fa52daa016786588c05a8ae4f16af45aa92 Mon Sep 17 00:00:00 2001
From: truelight <truelight@openttd.org>
Date: Wed, 30 Mar 2005 09:25:20 +0000
Subject: [PATCH] (svn r2109) -Fix: use FindVehicleOnTileZ(tile, 0) over
 FindVehicleBetween(tile, tile, 0)

---
 vehicle.c   | 10 ++++++++++
 vehicle.h   |  1 +
 water_cmd.c |  2 +-
 3 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/vehicle.c b/vehicle.c
index dba2a2abc2..884d435e13 100644
--- a/vehicle.c
+++ b/vehicle.c
@@ -117,6 +117,16 @@ bool EnsureNoVehicleZ(TileIndex tile, byte z)
 	return VehicleFromPos(tile, &ti, EnsureNoVehicleProcZ) == NULL;
 }
 
+Vehicle *FindVehicleOnTileZ(TileIndex tile, byte z)
+{
+	TileInfo ti;
+
+	ti.tile = tile;
+	ti.z = z;
+
+	return VehicleFromPos(tile, &ti, EnsureNoVehicleProcZ);
+}
+
 Vehicle *FindVehicleBetween(TileIndex from, TileIndex to, byte z)
 {
 	int x1 = TileX(from);
diff --git a/vehicle.h b/vehicle.h
index 5e822aa6cd..0e6cb77a16 100644
--- a/vehicle.h
+++ b/vehicle.h
@@ -258,6 +258,7 @@ void DeleteVehicle(Vehicle *v);
 void DeleteVehicleChain(Vehicle *v);
 void *VehicleFromPos(TileIndex tile, void *data, VehicleFromPosProc *proc);
 void CallVehicleTicks(void);
+Vehicle *FindVehicleOnTileZ(TileIndex tile, byte z);
 
 void InitializeTrains(void);
 
diff --git a/water_cmd.c b/water_cmd.c
index d9fd9f080b..64278cc0e7 100644
--- a/water_cmd.c
+++ b/water_cmd.c
@@ -532,7 +532,7 @@ static void TileLoopWaterHelper(TileIndex tile, const TileIndexDiffC *offs)
 
 		_current_player = OWNER_WATER;
 		{
-			Vehicle *v = FindVehicleBetween(target, target, 0);
+			Vehicle *v = FindVehicleOnTileZ(target, 0);
 			if (v != NULL) FloodVehicle(v);
 		}