mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r22699) -Fix [FS#4681]: Cost of adding an extra road type to a bridge or tunnel was undercalculated (adf88)

This commit is contained in:
rubidium 2011-07-30 13:55:44 +00:00
parent 9c239bb988
commit cfc2c5db42
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/road_cmd.cpp
View File

@ -662,12 +662,14 @@ do_clear:;
if (ret.Failed()) return ret;
}
cost.AddCost(CountBits(pieces) * _price[PR_BUILD_ROAD]);
if (!need_to_clear && IsTileType(tile, MP_TUNNELBRIDGE)) {
/* Pay for *every* tile of the bridge or tunnel */
cost.MultiplyCost(GetTunnelBridgeLength(GetOtherTunnelBridgeEnd(tile), tile) + 2);
}
uint num_pieces = (!need_to_clear && IsTileType(tile, MP_TUNNELBRIDGE)) ?
/* There are 2 pieces on *every* tile of the bridge or tunnel */
2 * (GetTunnelBridgeLength(GetOtherTunnelBridgeEnd(tile), tile) + 2) :
/* Count pieces */
CountBits(pieces);
cost.AddCost(num_pieces * _price[PR_BUILD_ROAD]);
if (flags & DC_EXEC) {
switch (GetTileType(tile)) {