diff options
| author | rubidium <rubidium@openttd.org> | 2011-11-08 19:44:41 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2011-11-08 19:44:41 +0000 |
| commit | 704dcc0a475e1361a913a43ae0b5d601dde807cc (patch) | |
| tree | 4d06b95193a8fc73fb67a134a88c1be0380b5950 | |
| parent | aca5f7ccf541664816067c96a61f95f623ed9475 (diff) | |
| download | openttd-704dcc0a475e1361a913a43ae0b5d601dde807cc.tar.xz | |
(svn r23167) -Codechange [FS#4818]: make IsTunnelInWay z parameters signed as well (hackalittlebit)
| -rw-r--r-- | src/tunnel_map.cpp | 6 | ||||
| -rw-r--r-- | src/tunnel_map.h | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/tunnel_map.cpp b/src/tunnel_map.cpp index 405e6fb38..7639fa949 100644 --- a/src/tunnel_map.cpp +++ b/src/tunnel_map.cpp @@ -45,10 +45,10 @@ TileIndex GetOtherTunnelEnd(TileIndex tile) * @param dir the direction to start searching to. * @return true if and only if there is a tunnel. */ -bool IsTunnelInWayDir(TileIndex tile, uint z, DiagDirection dir) +bool IsTunnelInWayDir(TileIndex tile, int z, DiagDirection dir) { TileIndexDiff delta = TileOffsByDiagDir(dir); - uint height; + int height; do { tile -= delta; @@ -65,7 +65,7 @@ bool IsTunnelInWayDir(TileIndex tile, uint z, DiagDirection dir) * @param z the 'z' to search on. * @return true if and only if there is a tunnel. */ -bool IsTunnelInWay(TileIndex tile, uint z) +bool IsTunnelInWay(TileIndex tile, int z) { return IsTunnelInWayDir(tile, z, (TileX(tile) > (MapMaxX() / 2)) ? DIAGDIR_NE : DIAGDIR_SW) || IsTunnelInWayDir(tile, z, (TileY(tile) > (MapMaxY() / 2)) ? DIAGDIR_NW : DIAGDIR_SE); diff --git a/src/tunnel_map.h b/src/tunnel_map.h index 2a167055a..c4f68f729 100644 --- a/src/tunnel_map.h +++ b/src/tunnel_map.h @@ -38,8 +38,8 @@ static inline bool IsTunnelTile(TileIndex t) } TileIndex GetOtherTunnelEnd(TileIndex); -bool IsTunnelInWay(TileIndex, uint z); -bool IsTunnelInWayDir(TileIndex tile, uint z, DiagDirection dir); +bool IsTunnelInWay(TileIndex, int z); +bool IsTunnelInWayDir(TileIndex tile, int z, DiagDirection dir); /** * Makes a road tunnel entrance |