From fec7be21bfaade6ece30892fc2f7179fc9ba011d Mon Sep 17 00:00:00 2001 From: peter1138 Date: Wed, 28 Jun 2006 18:37:53 +0000 Subject: (svn r5406) - Regression [r5403]: Fix assertion in TileLoop_Water() caused by oil rigs also using it... --- water_cmd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'water_cmd.c') diff --git a/water_cmd.c b/water_cmd.c index 69adf9b7e..53c12daf4 100644 --- a/water_cmd.c +++ b/water_cmd.c @@ -642,7 +642,7 @@ static void FloodVehicle(Vehicle *v) } } -// 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 @@ void TileLoop_Water(TileIndex tile) }; /* 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)) { -- cgit v1.2.3-54-g00ecf