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/object_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/object_cmd.cpp')
-rw-r--r-- | src/object_cmd.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/object_cmd.cpp b/src/object_cmd.cpp index 4038288d0..b5b992152 100644 --- a/src/object_cmd.cpp +++ b/src/object_cmd.cpp @@ -295,7 +295,7 @@ CommandCost CmdBuildObject(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3 /* Finally do a check for bridges. */ TILE_AREA_LOOP(t, ta) { - if (MayHaveBridgeAbove(t) && IsBridgeAbove(t) && ( + if (IsBridgeAbove(t) && ( !(spec->flags & OBJECT_FLAG_ALLOW_UNDER_BRIDGE) || (GetTileMaxZ(t) + spec->height >= GetBridgeHeight(GetSouthernBridgeEnd(t))))) { return_cmd_error(STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST); |