mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r9950) -Feature(tte): allow terraforming under bridges.

release/0.6
rubidium 2007-05-26 23:23:22 +00:00
parent c69458d894
commit 8602acc433
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/clear_cmd.cpp
View File

@ -291,24 +291,24 @@ int32 CmdTerraformLand(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
for (count = ts.tile_table_count; count != 0; count--, ti++) { for (count = ts.tile_table_count; count != 0; count--, ti++) {
TileIndex tile = *ti; TileIndex tile = *ti;
if (MayHaveBridgeAbove(tile) && IsBridgeAbove(tile)) { uint z_min = TerraformGetHeightOfTile(&ts, tile + TileDiffXY(0, 0));
uint z_max = z_min;
uint t = TerraformGetHeightOfTile(&ts, tile + TileDiffXY(1, 0));
z_min = min(z_min, t);
z_max = max(z_max, t);
t = TerraformGetHeightOfTile(&ts, tile + TileDiffXY(1, 1));
z_min = min(z_min, t);
z_max = max(z_max, t);
t = TerraformGetHeightOfTile(&ts, tile + TileDiffXY(0, 1));
z_min = min(z_min, t);
z_max = max(z_max, t);
if (direction == 1 && MayHaveBridgeAbove(tile) && IsBridgeAbove(tile) &&
GetBridgeHeight(GetSouthernBridgeEnd(tile)) <= z_max * TILE_HEIGHT) {
return_cmd_error(STR_5007_MUST_DEMOLISH_BRIDGE_FIRST); return_cmd_error(STR_5007_MUST_DEMOLISH_BRIDGE_FIRST);
} }
if (direction == -1 && IsTunnelInWay(tile, z_min * TILE_HEIGHT)) {
if (direction == -1) { return_cmd_error(STR_1002_EXCAVATION_WOULD_DAMAGE);
uint z, t;
z = TerraformGetHeightOfTile(&ts, tile + TileDiffXY(0, 0));
t = TerraformGetHeightOfTile(&ts, tile + TileDiffXY(1, 0));
if (t <= z) z = t;
t = TerraformGetHeightOfTile(&ts, tile + TileDiffXY(1, 1));
if (t <= z) z = t;
t = TerraformGetHeightOfTile(&ts, tile + TileDiffXY(0, 1));
if (t <= z) z = t;
if (IsTunnelInWay(tile, z * TILE_HEIGHT)) {
return_cmd_error(STR_1002_EXCAVATION_WOULD_DAMAGE);
}
} }
} }
} }