cpp/openttd-patchpack/source Changeset - r14641:37c0a6312793

Changeset - r14641:37c0a6312793

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

terkhen - 14 years ago 2010-02-24 21:53:16
terkhen@openttd.org

(svn r19230) -Feature: Allow to remove multiple road stops using drag and drop.

4 files changed with 61 insertions and 32 deletions:

src/ai/api/ai_road.cpp

src/road_gui.cpp

src/station_cmd.cpp

src/viewport_type.h

0 comments (0 inline, 0 general)

src/ai/api/ai_road.cpp

➞

Show inline comments

@@ @@ -578,7 +578,7 @@ static bool NeighbourHasReachableRoad(:: @@
 	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)

src/road_gui.cpp

➞

Show inline comments

@@ @@ -260,7 +260,7 @@ static void PlaceRoadStop(TileIndex star @@
 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(TileInd @@
 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;
+			}
+		}
+	}

src/station_cmd.cpp

➞

Show inline comments

@@ @@ -1834,40 +1834,57 @@ static CommandCost RemoveRoadStop(TileIn @@
 	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;
 	/* 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));
 	Owner road_owner = GetRoadOwner(tile, ROADTYPE_ROAD);
 	Owner tram_owner = GetRoadOwner(tile, ROADTYPE_TRAM);
 	CommandCost ret = RemoveRoadStop(tile, flags);
 	/* 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);
 	uint8 width = (uint8)GB(p1, 0, 8);
 	uint8 height = (uint8)GB(p1, 8, 8);
 	/* 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;
 	TileArea roadstop_area(tile, width, height);
 	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;
+}
 /**

src/viewport_type.h

➞

Show inline comments

@@ @@ -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 */

0 comments (0 inline, 0 general)