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

(svn r20668) -Codechange: add (more) support for bridges over objects

Browse Source
This commit is contained in:
rubidium
2010-08-28 19:02:21 +00:00
parent 3e67b4fe5f
commit 41a80490be
3 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/object_cmd.cpp
View File

@@ -127,7 +127,7 @@ void UpdateCompanyHQ(TileIndex tile, uint score)
}
}
extern CommandCost CheckBuildableTile(TileIndex tile, uint invalid_dirs, int &allowed_z);
extern CommandCost CheckBuildableTile(TileIndex tile, uint invalid_dirs, int &allowed_z, bool check_bridge);
static CommandCost ClearTile_Object(TileIndex tile, DoCommandFlag flags);
/**
@@ -189,12 +189,22 @@ CommandCost CmdBuildObject(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
/* Check whether the ground is flat enough. */
int allowed_z = -1;
TILE_AREA_LOOP(t, ta) {
cost.AddCost(CheckBuildableTile(t, 0, allowed_z));
/* We'll do the bridge test later; it's quite custom. */
cost.AddCost(CheckBuildableTile(t, 0, allowed_z, false));
}
}
}
if (cost.Failed()) return cost;
/* Finally do a check for bridges. */
TILE_AREA_LOOP(t, ta) {
if (MayHaveBridgeAbove(t) && IsBridgeAbove(t) && (
!(spec->flags & OBJECT_FLAG_ALLOW_UNDER_BRIDGE) ||
(GetTileMaxZ(t) + spec->height * TILE_HEIGHT >= GetBridgeHeight(GetSouthernBridgeEnd(t))))) {
return_cmd_error(STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST);
}
}
int hq_score = 0;
switch (type) {
case OBJECT_TRANSMITTER: