diff options
| author | smatz <smatz@openttd.org> | 2010-02-25 14:09:58 +0000 |
|---|---|---|
| committer | smatz <smatz@openttd.org> | 2010-02-25 14:09:58 +0000 |
| commit | 1ad5e1cece4b14d43d3e2600f87c17a11d25c808 (patch) | |
| tree | 82882e473df08ded4e2720e7c828cf2c06188c58 | |
| parent | 77214378caf61915bc81580311643c124c4d2696 (diff) | |
| download | openttd-1ad5e1cece4b14d43d3e2600f87c17a11d25c808.tar.xz | |
(svn r19249) -Fix [FS#3642](r18803): start and end tiles were swapped in CMD_REMOVE_LONG_ROAD
| -rw-r--r-- | src/ai/api/ai_road.cpp | 4 | ||||
| -rw-r--r-- | src/road_cmd.cpp | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/ai/api/ai_road.cpp b/src/ai/api/ai_road.cpp index b9ffc68be..b03efd8c9 100644 --- a/src/ai/api/ai_road.cpp +++ b/src/ai/api/ai_road.cpp @@ -550,7 +550,7 @@ static bool NeighbourHasReachableRoad(::RoadTypes rts, TileIndex start_tile, Dia EnforcePrecondition(false, ::TileX(start) == ::TileX(end) || ::TileY(start) == ::TileY(end)); EnforcePrecondition(false, IsRoadTypeAvailable(GetCurrentRoadType())); - return AIObject::DoCommand(end, start, (::TileY(start) != ::TileY(end) ? 4 : 0) | (start < end ? 1 : 2) | (AIObject::GetRoadType() << 3), CMD_REMOVE_LONG_ROAD); + return AIObject::DoCommand(start, end, (::TileY(start) != ::TileY(end) ? 4 : 0) | (start < end ? 1 : 2) | (AIObject::GetRoadType() << 3), CMD_REMOVE_LONG_ROAD); } /* static */ bool AIRoad::RemoveRoadFull(TileIndex start, TileIndex end) @@ -560,7 +560,7 @@ static bool NeighbourHasReachableRoad(::RoadTypes rts, TileIndex start_tile, Dia EnforcePrecondition(false, ::TileX(start) == ::TileX(end) || ::TileY(start) == ::TileY(end)); EnforcePrecondition(false, IsRoadTypeAvailable(GetCurrentRoadType())); - return AIObject::DoCommand(end, start, (::TileY(start) != ::TileY(end) ? 4 : 0) | (start < end ? 2 : 1) | (AIObject::GetRoadType() << 3), CMD_REMOVE_LONG_ROAD); + return AIObject::DoCommand(start, end, (::TileY(start) != ::TileY(end) ? 4 : 0) | (start < end ? 2 : 1) | (AIObject::GetRoadType() << 3), CMD_REMOVE_LONG_ROAD); } /* static */ bool AIRoad::RemoveRoadDepot(TileIndex tile) diff --git a/src/road_cmd.cpp b/src/road_cmd.cpp index 8ee878745..9e9f9c141 100644 --- a/src/road_cmd.cpp +++ b/src/road_cmd.cpp @@ -779,9 +779,9 @@ CommandCost CmdBuildLongRoad(TileIndex start_tile, DoCommandFlag flags, uint32 p } /** Remove a long piece of road. - * @param end_tile end tile of drag + * @param start_tile start tile of drag * @param flags operation to perform - * @param p1 start tile of drag + * @param p1 end tile of drag * @param p2 various bitstuffed elements * - p2 = (bit 0) - start tile starts in the 2nd half of tile (p2 & 1) * - p2 = (bit 1) - end tile starts in the 2nd half of tile (p2 & 2) @@ -790,13 +790,13 @@ CommandCost CmdBuildLongRoad(TileIndex start_tile, DoCommandFlag flags, uint32 p * @param text unused * @return the cost of this operation or an error */ -CommandCost CmdRemoveLongRoad(TileIndex end_tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text) +CommandCost CmdRemoveLongRoad(TileIndex start_tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text) { CommandCost cost(EXPENSES_CONSTRUCTION); if (p1 >= MapSize()) return CMD_ERROR; - TileIndex start_tile = p1; + TileIndex end_tile = p1; RoadType rt = (RoadType)GB(p2, 3, 2); if (!IsValidRoadType(rt)) return CMD_ERROR; @@ -829,7 +829,7 @@ CommandCost CmdRemoveLongRoad(TileIndex end_tile, DoCommandFlag flags, uint32 p1 if (flags & DC_EXEC) { money -= ret.GetCost(); if (money < 0) { - _additional_cash_required = DoCommand(end_tile, start_tile, p2, flags & ~DC_EXEC, CMD_REMOVE_LONG_ROAD).GetCost(); + _additional_cash_required = DoCommand(start_tile, end_tile, p2, flags & ~DC_EXEC, CMD_REMOVE_LONG_ROAD).GetCost(); return cost; } RemoveRoad(tile, flags, bits, rt, true, false); |