(svn r22451) -Codechange: Test for bridges and tunnels during the first pass only while terraforming (HackaLittleBit)

This commit is contained in:
alberth 2011-05-14 09:26:16 +00:00
parent 772fd8f6b5
commit a63b22991d

View File

@ -308,6 +308,7 @@ CommandCost CmdTerraformLand(TileIndex tile, DoCommandFlag flags, uint32 p1, uin
if (z_E > z_min) tileh |= SLOPE_E; if (z_E > z_min) tileh |= SLOPE_E;
if (z_N > z_min) tileh |= SLOPE_N; if (z_N > z_min) tileh |= SLOPE_N;
if (pass == 0) {
/* Check if bridge would take damage */ /* Check if bridge would take damage */
if (direction == 1 && MayHaveBridgeAbove(tile) && IsBridgeAbove(tile) && if (direction == 1 && MayHaveBridgeAbove(tile) && IsBridgeAbove(tile) &&
GetBridgeHeight(GetSouthernBridgeEnd(tile)) <= z_max * TILE_HEIGHT) { GetBridgeHeight(GetSouthernBridgeEnd(tile)) <= z_max * TILE_HEIGHT) {
@ -319,6 +320,7 @@ CommandCost CmdTerraformLand(TileIndex tile, DoCommandFlag flags, uint32 p1, uin
_terraform_err_tile = tile; // highlight the tile above the tunnel _terraform_err_tile = tile; // highlight the tile above the tunnel
return_cmd_error(STR_ERROR_EXCAVATION_WOULD_DAMAGE); return_cmd_error(STR_ERROR_EXCAVATION_WOULD_DAMAGE);
} }
}
/* Is the tile already cleared? */ /* Is the tile already cleared? */
const ClearedObjectArea *coa = FindClearedObject(tile); const ClearedObjectArea *coa = FindClearedObject(tile);