mirror/OpenTTD
1
0
Fork 1
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-09-01 10:59:12 +00:00
Code Issues Activity

(svn r18974) -Fix [FS#3578]: CMD_BUILD_ROAD missed CMD_AUTO. Also do not access tiles anymore after clearing them; that fails either in test or exec run.

Browse Source
This commit is contained in:
frosch
2010-01-31 20:28:36 +00:00
parent 8e6096931a
commit cbbe311cea
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/road_cmd.cpp
View File

@@ -483,6 +483,7 @@ CommandCost CmdBuildRoad(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32
Slope tileh = GetTileSlope(tile, NULL);
bool tile_cleared = false; // Used to remember that the tile was cleared during test run
switch (GetTileType(tile)) {
case MP_ROAD:
switch (GetRoadTileType(tile)) {
@@ -601,6 +602,7 @@ do_clear:;
CommandCost ret = DoCommand(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
if (ret.Failed()) return ret;
cost.AddCost(ret);
tile_cleared = true;
} break;
}
@@ -615,7 +617,7 @@ do_clear:;
cost.AddCost(ret);
}
if (IsTileType(tile, MP_ROAD)) {
if (!tile_cleared && IsTileType(tile, MP_ROAD)) {
/* Don't put the pieces that already exist */
pieces &= ComplementRoadBits(existing);
@@ -637,10 +639,10 @@ do_clear:;
}
}
if (!EnsureNoVehicleOnGround(tile)) return CMD_ERROR;
if (!tile_cleared && !EnsureNoVehicleOnGround(tile)) return CMD_ERROR;
cost.AddCost(CountBits(pieces) * _price[PR_BUILD_ROAD]);
if (IsTileType(tile, MP_TUNNELBRIDGE)) {
if (!tile_cleared && IsTileType(tile, MP_TUNNELBRIDGE)) {
/* Pay for *every* tile of the bridge or tunnel */
cost.MultiplyCost(GetTunnelBridgeLength(GetOtherTunnelBridgeEnd(tile), tile) + 2);
}