diff options
| author | rubidium <rubidium@openttd.org> | 2014-09-21 11:24:51 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2014-09-21 11:24:51 +0000 |
| commit | 9daf7e749ccb00873443e2261379bf31999664d9 (patch) | |
| tree | c6121f8173938736242b84b2830058d330f1da9a /src/water_cmd.cpp | |
| parent | 982f5a6aa2f600106f9bd292ebefcef52e6e65e6 (diff) | |
| download | openttd-9daf7e749ccb00873443e2261379bf31999664d9.tar.xz | |
(svn r26879) -Codechange: remove most MayHaveBridgeAbove calls since the data is now always accessible
Diffstat (limited to 'src/water_cmd.cpp')
| -rw-r--r-- | src/water_cmd.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/water_cmd.cpp b/src/water_cmd.cpp index 7b5272a41..7b74363be 100644 --- a/src/water_cmd.cpp +++ b/src/water_cmd.cpp @@ -109,8 +109,7 @@ CommandCost CmdBuildShipDepot(TileIndex tile, DoCommandFlag flags, uint32 p1, ui return_cmd_error(STR_ERROR_MUST_BE_BUILT_ON_WATER); } - if ((MayHaveBridgeAbove(tile) && IsBridgeAbove(tile)) || - (MayHaveBridgeAbove(tile2) && IsBridgeAbove(tile2))) return_cmd_error(STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST); + if (IsBridgeAbove(tile) || IsBridgeAbove(tile2)) return_cmd_error(STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST); if (!IsTileFlat(tile) || !IsTileFlat(tile2)) { /* Prevent depots on rapids */ @@ -289,9 +288,7 @@ static CommandCost DoBuildLock(TileIndex tile, DiagDirection dir, DoCommandFlag return_cmd_error(STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION); } - if ((MayHaveBridgeAbove(tile) && IsBridgeAbove(tile)) || - (MayHaveBridgeAbove(tile - delta) && IsBridgeAbove(tile - delta)) || - (MayHaveBridgeAbove(tile + delta) && IsBridgeAbove(tile + delta))) { + if (IsBridgeAbove(tile) || IsBridgeAbove(tile - delta) || IsBridgeAbove(tile + delta)) { return_cmd_error(STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST); } |