From 10daaca5eae0336414f5924726b6296adea16c33 Mon Sep 17 00:00:00 2001 From: Michael Lutz Date: Sun, 16 Oct 2022 17:51:53 +0200 Subject: [PATCH] Fix db98cedb: Swap parameters for CmdRemoveRailroadTrack, too. --- src/rail_cmd.cpp | 6 +++--- src/rail_cmd.h | 4 ++-- src/road_cmd.h | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/rail_cmd.cpp b/src/rail_cmd.cpp index 6ef44c1f96..894e99a80b 100644 --- a/src/rail_cmd.cpp +++ b/src/rail_cmd.cpp @@ -940,15 +940,15 @@ CommandCost CmdBuildRailroadTrack(DoCommandFlag flags, TileIndex end_tile, TileI * Build rail on a stretch of track. * Stub for the unified rail builder/remover * @param flags operation to perform - * @param tile start tile of drag * @param end_tile end tile of drag + * @param start_tile start tile of drag * @param track track-orientation * @return the cost of this operation or an error * @see CmdRailTrackHelper */ -CommandCost CmdRemoveRailroadTrack(DoCommandFlag flags, TileIndex tile, TileIndex end_tile, Track track) +CommandCost CmdRemoveRailroadTrack(DoCommandFlag flags, TileIndex end_tile, TileIndex start_tile, Track track) { - return CmdRailTrackHelper(flags, tile, end_tile, INVALID_RAILTYPE, track, true, false, false); + return CmdRailTrackHelper(flags, start_tile, end_tile, INVALID_RAILTYPE, track, true, false, false); } /** diff --git a/src/rail_cmd.h b/src/rail_cmd.h index 2a1b696906..8bee52e74c 100644 --- a/src/rail_cmd.h +++ b/src/rail_cmd.h @@ -15,8 +15,8 @@ #include "rail_type.h" #include "signal_type.h" -CommandCost CmdBuildRailroadTrack(DoCommandFlag flags, TileIndex tile, TileIndex end_tile, RailType railtype, Track track, bool auto_remove_signals, bool fail_on_obstacle); -CommandCost CmdRemoveRailroadTrack(DoCommandFlag flags, TileIndex tile, TileIndex end_tile, Track track); +CommandCost CmdBuildRailroadTrack(DoCommandFlag flags, TileIndex end_tile, TileIndex start_tile, RailType railtype, Track track, bool auto_remove_signals, bool fail_on_obstacle); +CommandCost CmdRemoveRailroadTrack(DoCommandFlag flags, TileIndex end_tile, TileIndex start_tile, Track track); CommandCost CmdBuildSingleRail(DoCommandFlag flags, TileIndex tile, RailType railtype, Track track, bool auto_remove_signals); CommandCost CmdRemoveSingleRail(DoCommandFlag flags, TileIndex tile, Track track); CommandCost CmdBuildTrainDepot(DoCommandFlag flags, TileIndex tile, RailType railtype, DiagDirection dir); diff --git a/src/road_cmd.h b/src/road_cmd.h index 82f09d2fa9..21539e6cb8 100644 --- a/src/road_cmd.h +++ b/src/road_cmd.h @@ -17,8 +17,8 @@ void DrawRoadDepotSprite(int x, int y, DiagDirection dir, RoadType rt); void UpdateNearestTownForRoadTiles(bool invalidate); -CommandCost CmdBuildLongRoad(DoCommandFlag flags, TileIndex start_tile, TileIndex end_tile, RoadType rt, Axis axis, DisallowedRoadDirections drd, bool start_half, bool end_half, bool is_ai); -std::tuple CmdRemoveLongRoad(DoCommandFlag flags, TileIndex start_tile, TileIndex end_tile, RoadType rt, Axis axis, bool start_half, bool end_half); +CommandCost CmdBuildLongRoad(DoCommandFlag flags, TileIndex end_tile, TileIndex start_tile, RoadType rt, Axis axis, DisallowedRoadDirections drd, bool start_half, bool end_half, bool is_ai); +std::tuple CmdRemoveLongRoad(DoCommandFlag flags, TileIndex end_tile, TileIndex start_tile, RoadType rt, Axis axis, bool start_half, bool end_half); CommandCost CmdBuildRoad(DoCommandFlag flags, TileIndex tile, RoadBits pieces, RoadType rt, DisallowedRoadDirections toggle_drd, TownID town_id); CommandCost CmdBuildRoadDepot(DoCommandFlag flags, TileIndex tile, RoadType rt, DiagDirection dir); CommandCost CmdConvertRoad(DoCommandFlag flags, TileIndex tile, TileIndex area_start, RoadType to_type); -- 2.11.4.GIT