dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r3644) Don't use FindLandscapeHeightByTile() when it's overkill - often it was just a complicated way of writing GetTileSlope(tile, NULL)

Browse Source
This commit is contained in:
tron
2006-02-21 07:41:54 +00:00
parent 35fb17947a
commit 4b46883751
6 changed files with 83 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tunnelbridge_cmd.c
View File

@@ -428,17 +428,17 @@ not_valid_below:;
static bool DoCheckTunnelInWay(TileIndex tile, uint z, uint dir)
{
TileIndexDiff delta = TileOffsByDir(dir);
TileInfo ti;
uint height;
do {
tile -= delta;
FindLandscapeHeightByTile(&ti, tile);
} while (z < ti.z);
height = GetTileZ(tile);
} while (z < tile);
if (z == ti.z &&
ti.type == MP_TUNNELBRIDGE &&
GB(ti.map5, 4, 4) == 0 &&
GB(ti.map5, 0, 2) == dir) {
if (z == tile &&
IsTileType(tile, MP_TUNNELBRIDGE) &&
GB(_m[tile].m5, 4, 4) == 0 &&
GB(_m[tile].m5, 0, 2) == dir) {
_error_message = STR_5003_ANOTHER_TUNNEL_IN_THE_WAY;
return false;
}