summaryrefslogtreecommitdiff
path: root/tunnelbridge_cmd.c
diff options
context:
space:
mode:
Diffstat (limited to 'tunnelbridge_cmd.c')
-rw-r--r--tunnelbridge_cmd.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/tunnelbridge_cmd.c b/tunnelbridge_cmd.c
index 23d4e3806..1adcd902a 100644
--- a/tunnelbridge_cmd.c
+++ b/tunnelbridge_cmd.c
@@ -698,7 +698,7 @@ static int32 DoClearBridge(uint tile, uint32 flags)
int32 cost;
// check if we own the tile below the bridge..
- if (_current_player != OWNER_WATER && (!CheckTileOwnership(tile) || !EnsureNoVehicleZ(tile, TileHeight(tile))))
+ if (_current_player != OWNER_WATER && (!CheckTileOwnership(tile) || !EnsureNoVehicleZ(tile, TilePixelHeight(tile))))
return CMD_ERROR;
cost = (_map5[tile] & 8) ? _price.remove_road * 2 : _price.remove_rail;
@@ -711,11 +711,11 @@ static int32 DoClearBridge(uint tile, uint32 flags)
return cost;
/* delete canal under bridge */
- } else if(_map5[tile] == 0xC8 && TileHeight(tile) != 0) {
+ } else if(_map5[tile] == 0xC8 && TilePixelHeight(tile) != 0) {
int32 cost;
// check for vehicles under bridge
- if (!EnsureNoVehicleZ(tile, TileHeight(tile)))
+ if (!EnsureNoVehicleZ(tile, TilePixelHeight(tile)))
return CMD_ERROR;
cost = _price.clear_water;
if (flags & DC_EXEC) {
@@ -743,7 +743,7 @@ static int32 DoClearBridge(uint tile, uint32 flags)
*/
tile += direction ? TILE_XY(0, 1) : TILE_XY( 1,0);
endtile -= direction ? TILE_XY(0, 1) : TILE_XY( 1,0);
- if ((v = FindVehicleBetween(tile, endtile, TileHeight(tile) + 8)) != NULL) {
+ if ((v = FindVehicleBetween(tile, endtile, TilePixelHeight(tile) + 8)) != NULL) {
VehicleInTheWayErrMsg(v);
return CMD_ERROR;
}
@@ -852,7 +852,7 @@ int32 DoConvertTunnelBridgeRail(uint tile, uint totype, bool exec)
} else if ((_map5[tile] & 0xF8) == 0xE0) {
// bridge middle part with rail below
// only check for train under bridge
- if (!CheckTileOwnership(tile) || !EnsureNoVehicleZ(tile, TileHeight(tile)))
+ if (!CheckTileOwnership(tile) || !EnsureNoVehicleZ(tile, TilePixelHeight(tile)))
return CMD_ERROR;
// tile is already of requested type?
@@ -920,7 +920,7 @@ uint GetBridgeHeight(const TileInfo *ti)
z_correction += 8;
// return the height there (the height of the NORTH CORNER)
- return TileHeight(tile) + z_correction;
+ return TilePixelHeight(tile) + z_correction;
}
static const byte _bridge_foundations[2][16] = {