petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r12350) -Fix [FS#1836](r11947): do not try ti flood water tile (performance increase)

Browse Source
This commit is contained in:
glx
2008-03-08 18:32:01 +00:00
parent 82e340c325
commit 220b2a1ae1
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/water_cmd.cpp
View File

@@ -912,7 +912,7 @@ static FloodingBehaviour GetFloodingBehaviour(TileIndex tile)
*/ */
static void DoFloodTile(TileIndex target) static void DoFloodTile(TileIndex target)
{ {
if (IsTileType(target, MP_WATER)) return; assert(!IsTileType(target, MP_WATER));
bool flooded = false; // Will be set to true if something is changed. bool flooded = false; // Will be set to true if something is changed.
@@ -1033,6 +1033,8 @@ void TileLoop_Water(TileIndex tile)
for (Direction dir = DIR_BEGIN; dir < DIR_END; dir++) { for (Direction dir = DIR_BEGIN; dir < DIR_END; dir++) {
TileIndex dest = AddTileIndexDiffCWrap(tile, TileIndexDiffCByDir(dir)); TileIndex dest = AddTileIndexDiffCWrap(tile, TileIndexDiffCByDir(dir));
if (dest == INVALID_TILE) continue; if (dest == INVALID_TILE) continue;
/* do not try to flood water tiles - increases performance a lot */
if (IsTileType(dest, MP_WATER)) continue;
uint z_dest; uint z_dest;
Slope slope_dest = (Slope)(GetFoundationSlope(dest, &z_dest) & ~SLOPE_HALFTILE_MASK & ~SLOPE_STEEP); Slope slope_dest = (Slope)(GetFoundationSlope(dest, &z_dest) & ~SLOPE_HALFTILE_MASK & ~SLOPE_STEEP);