summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/ai/api/ai_road.cpp2
-rw-r--r--src/road_gui.cpp53
-rw-r--r--src/station_cmd.cpp153
-rw-r--r--src/viewport_type.h2
4 files changed, 134 insertions, 76 deletions
diff --git a/src/ai/api/ai_road.cpp b/src/ai/api/ai_road.cpp
index 157a75e17..e486d3dc1 100644
--- a/src/ai/api/ai_road.cpp
+++ b/src/ai/api/ai_road.cpp
@@ -530,7 +530,7 @@ static bool NeighbourHasReachableRoad(::RoadTypes rts, TileIndex start_tile, Dia
p2 |= ::RoadTypeToRoadTypes(AIObject::GetRoadType()) << 2;
p2 |= entrance_dir << 6;
p2 |= (AIStation::IsValidStation(station_id) ? station_id : INVALID_STATION) << 16;
- return AIObject::DoCommand(tile, 0, p2, CMD_BUILD_ROAD_STOP);
+ return AIObject::DoCommand(tile, 1 | 1 << 8, p2, CMD_BUILD_ROAD_STOP);
}
/* static */ bool AIRoad::BuildRoadStation(TileIndex tile, TileIndex front, RoadVehicleType road_veh_type, StationID station_id)
diff --git a/src/road_gui.cpp b/src/road_gui.cpp
index 4476a02a7..7a0b14579 100644
--- a/src/road_gui.cpp
+++ b/src/road_gui.cpp
@@ -205,8 +205,9 @@ static void PlaceRoad_Depot(TileIndex tile)
/** Command callback for building road stops.
* @param result Result of the build road stop command.
- * @param tile Tile to build the stop at.
- * @param p1 Unused.
+ * @param tile Start tile.
+ * @param p1 bit 0..7: Width of the road stop.
+ * bit 8..15: Length of the road stop.
* @param p2 bit 0: 0 For bus stops, 1 for truck stops.
* bit 1: 0 For normal stops, 1 for drive-through.
* bit 2..3: The roadtypes.
@@ -222,12 +223,25 @@ void CcRoadStop(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2)
DiagDirection dir = (DiagDirection)GB(p2, 6, 2);
SndPlayTileFx(SND_1F_SPLAT, tile);
if (!_settings_client.gui.persistent_buildingtools) ResetObjectToPlace();
- BuildRoadOutsideStation(tile, dir);
- /* For a drive-through road stop build connecting road for other entrance. */
- if (HasBit(p2, 1)) BuildRoadOutsideStation(tile, ReverseDiagDir(dir));
+ TileArea roadstop_area(tile, GB(p1, 0, 8), GB(p1, 8, 8));
+ TILE_AREA_LOOP(cur_tile, roadstop_area) {
+ BuildRoadOutsideStation(cur_tile, dir);
+ /* For a drive-through road stop build connecting road for other entrance. */
+ if (HasBit(p2, 1)) BuildRoadOutsideStation(cur_tile, ReverseDiagDir(dir));
+ }
}
-static void PlaceRoadStop(TileIndex tile, uint32 p2, uint32 cmd)
+/**
+ * Place a new road stop.
+ * @param start_tile First tile of the area.
+ * @param end_tile Last tile of the area.
+ * @param p2 bit 0: 0 For bus stops, 1 for truck stops.
+ * bit 2..3: The roadtypes.
+ * bit 5: Allow stations directly adjacent to other stations.
+ * @param cmd Command to use.
+ * @see CcRoadStop()
+ */
+static void PlaceRoadStop(TileIndex start_tile, TileIndex end_tile, uint32 p2, uint32 cmd)
{
uint8 ddir = _road_station_picker_orientation;
SB(p2, 16, 16, INVALID_STATION); // no station to join
@@ -238,8 +252,9 @@ static void PlaceRoadStop(TileIndex tile, uint32 p2, uint32 cmd)
}
p2 |= ddir << 6; // Set the DiagDirecion into p2 bits 6 and 7.
- CommandContainer cmdcont = { tile, 0, p2, cmd, CcRoadStop, "" };
- ShowSelectStationIfNeeded(cmdcont, TileArea(tile, 1, 1));
+ TileArea ta(start_tile, end_tile);
+ CommandContainer cmdcont = { ta.tile, ta.w | ta.h << 8, p2, cmd, CcRoadStop, "" };
+ ShowSelectStationIfNeeded(cmdcont, ta);
}
static void PlaceRoad_BusStation(TileIndex tile)
@@ -247,7 +262,12 @@ 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);
} else {
- PlaceRoadStop(tile, (_ctrl_pressed << 5) | RoadTypeToRoadTypes(_cur_roadtype) << 2 | ROADSTOP_BUS, CMD_BUILD_ROAD_STOP | CMD_MSG(_road_type_infos[_cur_roadtype].err_build_station[ROADSTOP_BUS]));
+ 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);
+ } else {
+ VpStartPlaceSizing(tile, VPM_X_AND_Y_LIMITED, DDSP_BUILD_BUSSTOP);
+ }
+ VpSetPlaceSizingLimit(_settings_game.station.station_spread);
}
}
@@ -256,7 +276,12 @@ 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);
} else {
- PlaceRoadStop(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]));
+ 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);
+ } else {
+ VpStartPlaceSizing(tile, VPM_X_AND_Y_LIMITED, DDSP_BUILD_TRUCKSTOP);
+ }
+ VpSetPlaceSizingLimit(_settings_game.station.station_spread);
}
}
@@ -631,6 +656,14 @@ struct BuildRoadToolbarWindow : Window {
CMD_REMOVE_LONG_ROAD | CMD_MSG(_road_type_infos[_cur_roadtype].err_remove_road) :
CMD_BUILD_LONG_ROAD | CMD_MSG(_road_type_infos[_cur_roadtype].err_build_road), CcPlaySound1D);
break;
+
+ case DDSP_BUILD_BUSSTOP:
+ PlaceRoadStop(start_tile, end_tile, (_ctrl_pressed << 5) | RoadTypeToRoadTypes(_cur_roadtype) << 2 | ROADSTOP_BUS, CMD_BUILD_ROAD_STOP | CMD_MSG(_road_type_infos[_cur_roadtype].err_build_station[ROADSTOP_BUS]));
+ break;
+
+ 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;
}
}
}
diff --git a/src/station_cmd.cpp b/src/station_cmd.cpp
index 913f0cbc2..1be8235d1 100644
--- a/src/station_cmd.cpp
+++ b/src/station_cmd.cpp
@@ -800,58 +800,63 @@ static CommandCost CheckFlatLandRailStation(TileArea tile_area, DoCommandFlag fl
}
/** Checks if a road stop can be built at the given tile.
- * @param tile Location of the stop.
+ * @param tile_area Area to check.
* @param flags Operation to perform.
* @param invalid_dirs Prohibited directions (set of DiagDirections).
- * @param build_over_road True if trying to build a drive through station over a normal road tile.
+ * @param is_drive_through True if trying to build a drive-through station.
* @param axis Axis of a drive-through road stop.
* @param rts Road types to build. Bits already built at the tile will be removed.
* @return The cost in case of success, or an error code if it failed.
*/
-static CommandCost CheckFlatLandRoadStop(TileIndex tile, DoCommandFlag flags, uint invalid_dirs, bool build_over_road, Axis axis, RoadTypes &rts)
+static CommandCost CheckFlatLandRoadStop(TileArea tile_area, DoCommandFlag flags, uint invalid_dirs, bool is_drive_through, Axis axis, RoadTypes &rts)
{
+ CommandCost cost(EXPENSES_CONSTRUCTION);
int allowed_z = -1;
- CommandCost cost = CheckBuildableTile(tile, invalid_dirs, allowed_z);
- if (cost.Failed()) return cost;
+ TILE_AREA_LOOP(cur_tile, tile_area) {
+ CommandCost ret = CheckBuildableTile(cur_tile, invalid_dirs, allowed_z);
+ if (ret.Failed()) return ret;
+ cost.AddCost(ret);
- /* Road bits in the wrong direction. */
- if (build_over_road && (GetAllRoadBits(tile) & (axis == AXIS_X ? ROAD_Y : ROAD_X)) != 0) return_cmd_error(STR_ERROR_DRIVE_THROUGH_DIRECTION);
-
- RoadTypes cur_rts = IsNormalRoadTile(tile) ? GetRoadTypes(tile) : ROADTYPES_NONE;
- uint num_roadbits = 0;
- if (build_over_road) {
- /* There is a road, check if we can build road+tram stop over it. */
- if (HasBit(cur_rts, ROADTYPE_ROAD)) {
- Owner road_owner = GetRoadOwner(tile, ROADTYPE_ROAD);
- if (road_owner == OWNER_TOWN) {
- if (!_settings_game.construction.road_stop_on_town_road) return_cmd_error(STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD);
- } else if (!_settings_game.construction.road_stop_on_competitor_road && road_owner != OWNER_NONE && !CheckOwnership(road_owner)) {
- return CMD_ERROR;
+ bool build_over_road = is_drive_through && IsNormalRoadTile(cur_tile);
+ /* Road bits in the wrong direction. */
+ if (build_over_road && (GetAllRoadBits(cur_tile) & (axis == AXIS_X ? ROAD_Y : ROAD_X)) != 0) return_cmd_error(STR_ERROR_DRIVE_THROUGH_DIRECTION);
+
+ RoadTypes cur_rts = IsNormalRoadTile(cur_tile) ? GetRoadTypes(cur_tile) : ROADTYPES_NONE;
+ uint num_roadbits = 0;
+ if (build_over_road) {
+ /* There is a road, check if we can build road+tram stop over it. */
+ if (HasBit(cur_rts, ROADTYPE_ROAD)) {
+ Owner road_owner = GetRoadOwner(cur_tile, ROADTYPE_ROAD);
+ if (road_owner == OWNER_TOWN) {
+ if (!_settings_game.construction.road_stop_on_town_road) return_cmd_error(STR_ERROR_DRIVE_THROUGH_ON_TOWN_ROAD);
+ } else if (!_settings_game.construction.road_stop_on_competitor_road && road_owner != OWNER_NONE && !CheckOwnership(road_owner)) {
+ return CMD_ERROR;
+ }
+ num_roadbits += CountBits(GetRoadBits(cur_tile, ROADTYPE_ROAD));
}
- num_roadbits += CountBits(GetRoadBits(tile, ROADTYPE_ROAD));
- }
- /* There is a tram, check if we can build road+tram stop over it. */
- if (HasBit(cur_rts, ROADTYPE_TRAM)) {
- Owner tram_owner = GetRoadOwner(tile, ROADTYPE_TRAM);
- if (!_settings_game.construction.road_stop_on_competitor_road && tram_owner != OWNER_NONE && !CheckOwnership(tram_owner)) {
- return CMD_ERROR;
+ /* There is a tram, check if we can build road+tram stop over it. */
+ if (HasBit(cur_rts, ROADTYPE_TRAM)) {
+ Owner tram_owner = GetRoadOwner(cur_tile, ROADTYPE_TRAM);
+ if (!_settings_game.construction.road_stop_on_competitor_road && tram_owner != OWNER_NONE && !CheckOwnership(tram_owner)) {
+ return CMD_ERROR;
+ }
+ num_roadbits += CountBits(GetRoadBits(cur_tile, ROADTYPE_TRAM));
}
- num_roadbits += CountBits(GetRoadBits(tile, ROADTYPE_TRAM));
+
+ /* Do not remove roadtypes! */
+ rts |= cur_rts;
+ } else {
+ ret = DoCommand(cur_tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
+ if (ret.Failed()) return ret;
+ cost.AddCost(ret);
}
- /* Do not remove roadtypes! */
- rts |= cur_rts;
- } else {
- CommandCost ret = DoCommand(tile, 0, 0, flags, CMD_LANDSCAPE_CLEAR);
- if (ret.Failed()) return ret;
- cost.AddCost(ret);
+ uint roadbits_to_build = CountBits(rts) * 2 - num_roadbits;
+ cost.AddCost(_price[PR_BUILD_ROAD] * roadbits_to_build);
}
- uint roadbits_to_build = CountBits(rts) * 2 - num_roadbits;
- cost.AddCost(_price[PR_BUILD_ROAD] * roadbits_to_build);
-
return cost;
}
@@ -1591,9 +1596,10 @@ static RoadStop **FindRoadStopSpot(bool truck_station, Station *st)
}
/** Build a bus or truck stop.
- * @param tile Tile to build the stop at.
+ * @param tile Northernmost tile of the stop.
* @param flags Operation to perform.
- * @param p1 Unused.
+ * @param p1 bit 0..7: Width of the road stop.
+ * bit 8..15: Lenght of the road stop.
* @param p2 bit 0: 0 For bus stops, 1 for truck stops.
* bit 1: 0 For normal stops, 1 for drive-through.
* bit 2..3: The roadtypes.
@@ -1607,7 +1613,6 @@ CommandCost CmdBuildRoadStop(TileIndex tile, DoCommandFlag flags, uint32 p1, uin
{
bool type = HasBit(p2, 0);
bool is_drive_through = HasBit(p2, 1);
- bool build_over_road = is_drive_through && IsNormalRoadTile(tile);
RoadTypes rts = (RoadTypes)GB(p2, 2, 2);
StationID station_to_join = GB(p2, 16, 16);
bool reuse = (station_to_join != NEW_STATION);
@@ -1616,6 +1621,18 @@ CommandCost CmdBuildRoadStop(TileIndex tile, DoCommandFlag flags, uint32 p1, uin
Owner tram_owner = _current_company;
Owner road_owner = _current_company;
+ uint8 width = (uint8)GB(p1, 0, 8);
+ uint8 lenght = (uint8)GB(p1, 8, 8);
+
+ /* Check if the requested road stop is too big */
+ if (width > _settings_game.station.station_spread || lenght > _settings_game.station.station_spread) return_cmd_error(STR_ERROR_STATION_TOO_SPREAD_OUT);
+ /* Check for incorrect width / lenght. */
+ if (width == 0 || lenght == 0) return CMD_ERROR;
+ /* Check if the first tile and the last tile are valid */
+ if (!IsValidTile(tile) || TileAddWrap(tile, width - 1, lenght - 1) == INVALID_TILE) return CMD_ERROR;
+
+ TileArea roadstop_area(tile, width, lenght);
+
if (distant_join && (!_settings_game.station.distant_join_stations || !Station::IsValidID(station_to_join))) return CMD_ERROR;
if (!AreValidRoadTypes(rts) || !HasRoadTypesAvail(_current_company, rts)) return CMD_ERROR;
@@ -1632,25 +1649,28 @@ CommandCost CmdBuildRoadStop(TileIndex tile, DoCommandFlag flags, uint32 p1, uin
if (!CheckIfAuthorityAllowsNewStation(tile, flags)) return CMD_ERROR;
- CommandCost cost = CheckFlatLandRoadStop(tile, flags, is_drive_through ? 5 << ddir : 1 << ddir, build_over_road, DiagDirToAxis(ddir), rts);
- if (cost.Failed()) return cost;
+ /* Total road stop cost. */
+ CommandCost cost(EXPENSES_CONSTRUCTION, roadstop_area.w * roadstop_area.h * _price[type ? PR_BUILD_STATION_TRUCK : PR_BUILD_STATION_BUS]);
+ CommandCost ret = CheckFlatLandRoadStop(roadstop_area, flags, is_drive_through ? 5 << ddir : 1 << ddir, is_drive_through, DiagDirToAxis(ddir), rts);
+ if (ret.Failed()) return ret;
+ cost.AddCost(ret);
Station *st = NULL;
- CommandCost ret = FindJoiningStation(INVALID_STATION, station_to_join, HasBit(p2, 5), TileArea(tile, 1, 1), &st);
+ ret = FindJoiningStation(INVALID_STATION, station_to_join, HasBit(p2, 5), roadstop_area, &st);
if (ret.Failed()) return ret;
/* Find a deleted station close to us */
if (st == NULL && reuse) st = GetClosestDeletedStation(tile);
- /* give us a road stop in the list, and check if something went wrong */
- if (!RoadStop::CanAllocateItem()) return_cmd_error(type ? STR_ERROR_TOO_MANY_TRUCK_STOPS : STR_ERROR_TOO_MANY_BUS_STOPS);
+ /* Check if this number of road stops can be allocated. */
+ if (!RoadStop::CanAllocateItem(roadstop_area.w * roadstop_area.h)) return_cmd_error(type ? STR_ERROR_TOO_MANY_TRUCK_STOPS : STR_ERROR_TOO_MANY_BUS_STOPS);
if (st != NULL) {
if (st->owner != _current_company) {
return_cmd_error(STR_ERROR_TOO_CLOSE_TO_ANOTHER_STATION);
}
- if (!st->rect.BeforeAddTile(tile, StationRect::ADD_TEST)) return CMD_ERROR;
+ if (!st->rect.BeforeAddRect(roadstop_area.tile, roadstop_area.w, roadstop_area.h, StationRect::ADD_TEST)) return CMD_ERROR;
} else {
/* allocate and initialize new station */
if (!Station::CanAllocateItem()) return_cmd_error(STR_ERROR_TOO_MANY_STATIONS_LOADING);
@@ -1667,33 +1687,36 @@ CommandCost CmdBuildRoadStop(TileIndex tile, DoCommandFlag flags, uint32 p1, uin
}
}
- cost.AddCost(_price[type ? PR_BUILD_STATION_TRUCK : PR_BUILD_STATION_BUS]);
-
if (flags & DC_EXEC) {
- RoadStop *road_stop = new RoadStop(tile);
- /* Insert into linked list of RoadStops */
- RoadStop **currstop = FindRoadStopSpot(type, st);
- *currstop = road_stop;
-
- if (type) {
- st->truck_station.Add(tile);
- } else {
- st->bus_station.Add(tile);
- }
+ /* Check every tile in the area. */
+ TILE_AREA_LOOP(cur_tile, roadstop_area) {
+ RoadStop *road_stop = new RoadStop(cur_tile);
+ /* Insert into linked list of RoadStops. */
+ RoadStop **currstop = FindRoadStopSpot(type, st);
+ *currstop = road_stop;
+
+ if (type) {
+ st->truck_station.Add(cur_tile);
+ } else {
+ st->bus_station.Add(cur_tile);
+ }
- /* initialize an empty station */
- st->AddFacility((type) ? FACIL_TRUCK_STOP : FACIL_BUS_STOP, tile);
+ /* Initialize an empty station. */
+ st->AddFacility((type) ? FACIL_TRUCK_STOP : FACIL_BUS_STOP, cur_tile);
- st->rect.BeforeAddTile(tile, StationRect::ADD_TRY);
+ st->rect.BeforeAddTile(cur_tile, StationRect::ADD_TRY);
- RoadStopType rs_type = type ? ROADSTOP_TRUCK : ROADSTOP_BUS;
- if (is_drive_through) {
- MakeDriveThroughRoadStop(tile, st->owner, road_owner, tram_owner, st->index, rs_type, rts, DiagDirToAxis(ddir));
- road_stop->MakeDriveThrough();
- } else {
- MakeRoadStop(tile, st->owner, st->index, rs_type, rts, ddir);
+ RoadStopType rs_type = type ? ROADSTOP_TRUCK : ROADSTOP_BUS;
+ if (is_drive_through) {
+ MakeDriveThroughRoadStop(cur_tile, st->owner, road_owner, tram_owner, st->index, rs_type, rts, DiagDirToAxis(ddir));
+ road_stop->MakeDriveThrough();
+ } else {
+ MakeRoadStop(cur_tile, st->owner, st->index, rs_type, rts, ddir);
+ }
}
+ }
+ if (st != NULL) {
st->UpdateVirtCoord();
UpdateStationAcceptance(st, false);
st->RecomputeIndustriesNear();
diff --git a/src/viewport_type.h b/src/viewport_type.h
index 72f1835e2..b32e6de90 100644
--- a/src/viewport_type.h
+++ b/src/viewport_type.h
@@ -109,6 +109,8 @@ enum ViewportDragDropSelectionProcess {
DDSP_PLACE_ROAD_X_DIR, ///< Road placement (X axis)
DDSP_PLACE_ROAD_Y_DIR, ///< Road placement (Y axis)
DDSP_PLACE_AUTOROAD, ///< Road placement (auto)
+ DDSP_BUILD_BUSSTOP, ///< Road stop placement (buses)
+ DDSP_BUILD_TRUCKSTOP, ///< Road stop placement (trucks)
};
#endif /* VIEWPORT_TYPE_H */
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2024-12-01 20:32:46 +0000