Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-17 21:25:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Depot building cost does not include foundation build cost (#6875)

Browse Source
This commit is contained in:
Jonathan G Rennison 2018-08-11 01:32:32 +01:00
parent b653c55d34
commit bdf155e60c
2 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/rail_cmd.cpp
View File

@ -1086,6 +1086,8 @@ CommandCost CmdBuildTrainDepot(TileIndex tile, DoCommandFlag flags, uint32 p1, u
DiagDirection dir = Extract<DiagDirection, 0, 2>(p2); DiagDirection dir = Extract<DiagDirection, 0, 2>(p2);
CommandCost cost(EXPENSES_CONSTRUCTION);
/* Prohibit construction if /* Prohibit construction if
* The tile is non-flat AND * The tile is non-flat AND
* 1) build-on-slopes is disabled * 1) build-on-slopes is disabled
@ -1093,14 +1095,14 @@ CommandCost CmdBuildTrainDepot(TileIndex tile, DoCommandFlag flags, uint32 p1, u
* 3) the exit points in the wrong direction * 3) the exit points in the wrong direction
*/ */
if (tileh != SLOPE_FLAT && ( if (tileh != SLOPE_FLAT) {
!_settings_game.construction.build_on_slopes || if (!_settings_game.construction.build_on_slopes || !CanBuildDepotByTileh(dir, tileh)) {
!CanBuildDepotByTileh(dir, tileh) return_cmd_error(STR_ERROR_FLAT_LAND_REQUIRED);
)) { }
return_cmd_error(STR_ERROR_FLAT_LAND_REQUIRED); cost.AddCost(_price[PR_BUILD_FOUNDATION]);
} }
CommandCost cost = DoCommand(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR); cost.AddCost(DoCommand(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR));
if (cost.Failed()) return cost; if (cost.Failed()) return cost;
if (IsBridgeAbove(tile)) return_cmd_error(STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST); if (IsBridgeAbove(tile)) return_cmd_error(STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST);

14
src/road_cmd.cpp
View File

@ -1141,15 +1141,17 @@ CommandCost CmdBuildRoadDepot(TileIndex tile, DoCommandFlag flags, uint32 p1, ui
if (!IsValidRoadType(rt) || !ValParamRoadType(rt)) return CMD_ERROR; if (!IsValidRoadType(rt) || !ValParamRoadType(rt)) return CMD_ERROR;
CommandCost cost(EXPENSES_CONSTRUCTION);
Slope tileh = GetTileSlope(tile); Slope tileh = GetTileSlope(tile);
if (tileh != SLOPE_FLAT && ( if (tileh != SLOPE_FLAT) {
!_settings_game.construction.build_on_slopes || if (!_settings_game.construction.build_on_slopes || !CanBuildDepotByTileh(dir, tileh)) {
!CanBuildDepotByTileh(dir, tileh) return_cmd_error(STR_ERROR_FLAT_LAND_REQUIRED);
)) { }
return_cmd_error(STR_ERROR_FLAT_LAND_REQUIRED); cost.AddCost(_price[PR_BUILD_FOUNDATION]);
} }
CommandCost cost = DoCommand(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR); cost.AddCost(DoCommand(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR));
if (cost.Failed()) return cost; if (cost.Failed()) return cost;
if (IsBridgeAbove(tile)) return_cmd_error(STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST); if (IsBridgeAbove(tile)) return_cmd_error(STR_ERROR_MUST_DEMOLISH_BRIDGE_FIRST);