petern/OpenTTD
1
0
Fork 0
forked from mirror/OpenTTD
Code Pull Requests Activity

(svn r26879) -Codechange: remove most MayHaveBridgeAbove calls since the data is now always accessible

Browse Source
This commit is contained in:
rubidium
2014-09-21 11:24:51 +00:00
parent 982f5a6aa2
commit 9daf7e749c
14 changed files with 38 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/object_cmd.cpp
View File

@@ -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);