gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-02-08 23:34:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r23723) -Codechange: speedup flood checks a bit

Browse Source
This commit is contained in:
yexo 2012-01-03 00:44:23 +00:00
parent 4027e58ba3
commit b9e19cc6c1
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/object_cmd.cpp
View File

@ -697,8 +697,8 @@ void GenerateObjects()
assert(tile < MapSize());
break;
}
tile = AddTileIndexDiffCWrap(tile, TileIndexDiffCByDiagDir(dir));
if (tile == INVALID_TILE) break;
tile += TileOffsByDiagDir(dir);
if (!IsValidTile(tile)) break;
}
}
}

8
src/water_cmd.cpp
View File

@ -1148,8 +1148,8 @@ void TileLoop_Water(TileIndex tile)
switch (GetFloodingBehaviour(tile)) {
case FLOOD_ACTIVE:
for (Direction dir = DIR_BEGIN; dir < DIR_END; dir++) {
TileIndex dest = AddTileIndexDiffCWrap(tile, TileIndexDiffCByDir(dir));
if (dest == INVALID_TILE) continue;
TileIndex dest = tile + TileOffsByDir(dir);
if (!IsValidTile(dest)) continue;
/* do not try to flood water tiles - increases performance a lot */
if (IsTileType(dest, MP_WATER)) continue;
@ -1167,8 +1167,8 @@ void TileLoop_Water(TileIndex tile)
Slope slope_here = GetFoundationSlope(tile) & ~SLOPE_HALFTILE_MASK & ~SLOPE_STEEP;
uint dir;
FOR_EACH_SET_BIT(dir, _flood_from_dirs[slope_here]) {
TileIndex dest = AddTileIndexDiffCWrap(tile, TileIndexDiffCByDir((Direction)dir));
if (dest == INVALID_TILE) continue;
TileIndex dest = tile + TileOffsByDir(dir);
if (!IsValidTile(dest)) continue;
FloodingBehaviour dest_behaviour = GetFloodingBehaviour(dest);
if ((dest_behaviour == FLOOD_ACTIVE) || (dest_behaviour == FLOOD_PASSIVE)) return;