diff options
| author | peter1138 <peter1138@openttd.org> | 2006-06-28 18:37:53 +0000 |
|---|---|---|
| committer | peter1138 <peter1138@openttd.org> | 2006-06-28 18:37:53 +0000 |
| commit | fec7be21bfaade6ece30892fc2f7179fc9ba011d (patch) | |
| tree | 5a4f9e9d9613926a13f93b5f5374caf60c36502e | |
| parent | 2c6df8aec317075c3fbc17d975d9beef8ec8c347 (diff) | |
| download | openttd-fec7be21bfaade6ece30892fc2f7179fc9ba011d.tar.xz | |
(svn r5406) - Regression [r5403]: Fix assertion in TileLoop_Water() caused by oil rigs also using it...
| -rw-r--r-- | water_cmd.c | 4 |
1 files changed, 2 insertions, 2 deletions
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)) { |