# HG changeset patch
# User peter1138
# Date 1151519873 0
# Node ID 0d2e6106082f283d045940ec83b09f3e91ea811a
# Parent  f46bb713cde604a08283f5e5385729d82d66872f
(svn r5406) - Regression [r5403]: Fix assertion in TileLoop_Water() caused by oil rigs also using it...

diff -r f46bb713cde6 -r 0d2e6106082f water_cmd.c
--- a/water_cmd.c	Wed Jun 28 17:50:26 2006 +0000
+++ b/water_cmd.c	Wed Jun 28 18:37:53 2006 +0000
@@ -642,7 +642,7 @@
 	}
 }
 
-// called from tunnelbridge_cmd
+// called from tunnelbridge_cmd, and by TileLoop_Industry()
 void TileLoop_Water(TileIndex tile)
 {
 	static const TileIndexDiffC _tile_loop_offs_array[][5] = {
@@ -654,7 +654,7 @@
 	};
 
 	/* Ensure sea-level canals do not flood */
-	if (!IsTileOwner(tile, OWNER_WATER)) return;
+	if (IsTileType(tile, MP_WATER) && !IsTileOwner(tile, OWNER_WATER)) return;
 
 	if (IS_INT_INSIDE(TileX(tile), 1, MapSizeX() - 3 + 1) &&
 			IS_INT_INSIDE(TileY(tile), 1, MapSizeY() - 3 + 1)) {