From aba24e44cf76479a33e78cc0a8d6d5279aeef00b Mon Sep 17 00:00:00 2001
From: terkhen <terkhen@openttd.org>
Date: Wed, 24 Feb 2010 21:53:16 +0000
Subject: [PATCH] (svn r19230) -Feature: Allow to remove multiple road stops
using drag and drop.
---
src/ai/api/ai_road.cpp | 2 +-
src/road_gui.cpp | 14 +++++++--
src/station_cmd.cpp | 69 ++++++++++++++++++++++++++----------------
src/viewport_type.h | 2 ++
4 files changed, 58 insertions(+), 29 deletions(-)
diff --git a/src/ai/api/ai_road.cpp b/src/ai/api/ai_road.cpp
index e486d3dc15..b9ffc68be7 100644
--- a/src/ai/api/ai_road.cpp
+++ b/src/ai/api/ai_road.cpp
@@ -578,7 +578,7 @@ static bool NeighbourHasReachableRoad(::RoadTypes rts, TileIndex start_tile, Dia
EnforcePrecondition(false, IsTileType(tile, MP_STATION));
EnforcePrecondition(false, IsRoadStop(tile));
- return AIObject::DoCommand(tile, 0, GetRoadStopType(tile), CMD_REMOVE_ROAD_STOP);
+ return AIObject::DoCommand(tile, 1 | 1 << 8, GetRoadStopType(tile), CMD_REMOVE_ROAD_STOP);
}
/* static */ Money AIRoad::GetBuildCost(RoadType roadtype, BuildType build_type)
diff --git a/src/road_gui.cpp b/src/road_gui.cpp
index 7a0b14579c..0fdb7c183b 100644
--- a/src/road_gui.cpp
+++ b/src/road_gui.cpp
@@ -260,7 +260,7 @@ static void PlaceRoadStop(TileIndex start_tile, TileIndex end_tile, uint32 p2, u
static void PlaceRoad_BusStation(TileIndex tile)
{
if (_remove_button_clicked) {
- DoCommandP(tile, 0, ROADSTOP_BUS, CMD_REMOVE_ROAD_STOP | CMD_MSG(_road_type_infos[_cur_roadtype].err_remove_station[ROADSTOP_BUS]), CcPlaySound1D);
+ VpStartPlaceSizing(tile, VPM_X_AND_Y, DDSP_REMOVE_BUSSTOP);
} else {
if (_road_station_picker_orientation < DIAGDIR_END) { // Not a drive-through stop.
VpStartPlaceSizing(tile, (DiagDirToAxis(_road_station_picker_orientation) == AXIS_X) ? VPM_X_LIMITED : VPM_Y_LIMITED, DDSP_BUILD_BUSSTOP);
@@ -274,7 +274,7 @@ static void PlaceRoad_BusStation(TileIndex tile)
static void PlaceRoad_TruckStation(TileIndex tile)
{
if (_remove_button_clicked) {
- DoCommandP(tile, 0, ROADSTOP_TRUCK, CMD_REMOVE_ROAD_STOP | CMD_MSG(_road_type_infos[_cur_roadtype].err_remove_station[ROADSTOP_TRUCK]), CcPlaySound1D);
+ VpStartPlaceSizing(tile, VPM_X_AND_Y, DDSP_REMOVE_TRUCKSTOP);
} else {
if (_road_station_picker_orientation < DIAGDIR_END) { // Not a drive-through stop.
VpStartPlaceSizing(tile, (DiagDirToAxis(_road_station_picker_orientation) == AXIS_X) ? VPM_X_LIMITED : VPM_Y_LIMITED, DDSP_BUILD_TRUCKSTOP);
@@ -664,6 +664,16 @@ struct BuildRoadToolbarWindow : Window {
case DDSP_BUILD_TRUCKSTOP:
PlaceRoadStop(start_tile, end_tile, (_ctrl_pressed << 5) | RoadTypeToRoadTypes(_cur_roadtype) << 2 | ROADSTOP_TRUCK, CMD_BUILD_ROAD_STOP | CMD_MSG(_road_type_infos[_cur_roadtype].err_build_station[ROADSTOP_TRUCK]));
break;
+
+ case DDSP_REMOVE_BUSSTOP: {
+ TileArea ta(start_tile, end_tile);
+ DoCommandP(ta.tile, ta.w | ta.h << 8, ROADSTOP_BUS, CMD_REMOVE_ROAD_STOP | CMD_MSG(_road_type_infos[_cur_roadtype].err_remove_station[ROADSTOP_BUS]), CcPlaySound1D);
+ } break;
+
+ case DDSP_REMOVE_TRUCKSTOP: {
+ TileArea ta(start_tile, end_tile);
+ DoCommandP(ta.tile, ta.w | ta.h << 8, ROADSTOP_TRUCK, CMD_REMOVE_ROAD_STOP | CMD_MSG(_road_type_infos[_cur_roadtype].err_remove_station[ROADSTOP_TRUCK]), CcPlaySound1D);
+ } break;
}
}
}
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
index 1be8235d1d..6a2216d7a4 100644
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -1834,40 +1834,57 @@ static CommandCost RemoveRoadStop(TileIndex tile, DoCommandFlag flags)
return CommandCost(EXPENSES_CONSTRUCTION, _price[is_truck ? PR_CLEAR_STATION_TRUCK : PR_CLEAR_STATION_BUS]);
}
-/** Remove a bus or truck stop
- * @param tile tile to remove the stop from
- * @param flags operation to perform
- * @param p1 not used
- * @param p2 bit 0: 0 for Bus stops, 1 for truck stops
- * @param text unused
- * @return the cost of this operation or an error
+/** Remove bus or truck stops.
+ * @param tile Northernmost tile of the removal area.
+ * @param flags Operation to perform.
+ * @param p1 bit 0..7: Width of the removal area.
+ * bit 8..15: Height of the removal area.
+ * @param p2 bit 0: 0 For bus stops, 1 for truck stops.
+ * @param text Unused.
+ * @return The cost of this operation or an error.
*/
CommandCost CmdRemoveRoadStop(TileIndex tile, DoCommandFlag flags, uint32 p1, uint32 p2, const char *text)
{
- /* Make sure the specified tile is a road stop of the correct type */
- if (!IsTileType(tile, MP_STATION) || !IsRoadStop(tile) || (uint32)GetRoadStopType(tile) != GB(p2, 0, 1)) return CMD_ERROR;
+ uint8 width = (uint8)GB(p1, 0, 8);
+ uint8 height = (uint8)GB(p1, 8, 8);
- /* Save the stop info before it is removed */
- bool is_drive_through = IsDriveThroughStopTile(tile);
- RoadTypes rts = GetRoadTypes(tile);
- RoadBits road_bits = IsDriveThroughStopTile(tile) ?
- ((GetRoadStopDir(tile) == DIAGDIR_NE) ? ROAD_X : ROAD_Y) :
- DiagDirToRoadBits(GetRoadStopDir(tile));
+ /* Check for incorrect width / height. */
+ if (width == 0 || height == 0) return CMD_ERROR;
+ /* Check if the first tile and the last tile are valid */
+ if (!IsValidTile(tile) || TileAddWrap(tile, width - 1, height - 1) == INVALID_TILE) return CMD_ERROR;
- Owner road_owner = GetRoadOwner(tile, ROADTYPE_ROAD);
- Owner tram_owner = GetRoadOwner(tile, ROADTYPE_TRAM);
- CommandCost ret = RemoveRoadStop(tile, flags);
+ TileArea roadstop_area(tile, width, height);
- /* If the stop was a drive-through stop replace the road */
- if ((flags & DC_EXEC) && ret.Succeeded() && is_drive_through) {
- /* Rebuild the drive throuhg road stop. As a road stop can only be
- * removed by the owner of the roadstop, _current_company is the
- * owner of the road stop. */
- MakeRoadNormal(tile, road_bits, rts, ClosestTownFromTile(tile, UINT_MAX)->index,
- road_owner, tram_owner);
+ int quantity = 0;
+ CommandCost cost(EXPENSES_CONSTRUCTION);
+ TILE_AREA_LOOP(cur_tile, roadstop_area) {
+ /* Make sure the specified tile is a road stop of the correct type */
+ if (!IsTileType(cur_tile, MP_STATION) || !IsRoadStop(cur_tile) || (uint32)GetRoadStopType(cur_tile) != GB(p2, 0, 1)) continue;
+
+ /* Save the stop info before it is removed */
+ bool is_drive_through = IsDriveThroughStopTile(cur_tile);
+ RoadTypes rts = GetRoadTypes(cur_tile);
+ RoadBits road_bits = IsDriveThroughStopTile(cur_tile) ?
+ ((GetRoadStopDir(cur_tile) == DIAGDIR_NE) ? ROAD_X : ROAD_Y) :
+ DiagDirToRoadBits(GetRoadStopDir(cur_tile));
+
+ Owner road_owner = GetRoadOwner(cur_tile, ROADTYPE_ROAD);
+ Owner tram_owner = GetRoadOwner(cur_tile, ROADTYPE_TRAM);
+ CommandCost ret = RemoveRoadStop(cur_tile, flags);
+ if (ret.Failed()) return ret;
+ cost.AddCost(ret);
+
+ quantity++;
+ /* If the stop was a drive-through stop replace the road */
+ if ((flags & DC_EXEC) && is_drive_through) {
+ MakeRoadNormal(cur_tile, road_bits, rts, ClosestTownFromTile(cur_tile, UINT_MAX)->index,
+ road_owner, tram_owner);
+ }
}
- return ret;
+ if (quantity == 0) return CMD_ERROR;
+
+ return cost;
}
/**
diff --git a/src/viewport_type.h b/src/viewport_type.h
index b32e6de90a..8581ddb00c 100644
--- a/src/viewport_type.h
+++ b/src/viewport_type.h
@@ -111,6 +111,8 @@ enum ViewportDragDropSelectionProcess {
DDSP_PLACE_AUTOROAD, ///< Road placement (auto)
DDSP_BUILD_BUSSTOP, ///< Road stop placement (buses)
DDSP_BUILD_TRUCKSTOP, ///< Road stop placement (trucks)
+ DDSP_REMOVE_BUSSTOP, ///< Road stop removal (buses)
+ DDSP_REMOVE_TRUCKSTOP, ///< Road stop removal (trucks)
};
#endif /* VIEWPORT_TYPE_H */