miguel.horta/openttd-cmclient
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Codechange: Make StationType an enum class. (#13339)

Browse Source
This commit is contained in:
Peter Nelson
2025-01-19 20:53:08 +00:00
committed by GitHub
parent b0ec3d6959
commit 4397aa3909
22 changed files with 196 additions and 196 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pathfinder/yapf/yapf_destrail.hpp
View File

@@ -146,7 +146,7 @@ public:
[[fallthrough]];
case OT_GOTO_STATION:
this->dest_tile = CalcClosestStationTile(v->current_order.GetDestination(), v->tile, v->current_order.IsType(OT_GOTO_STATION) ? STATION_RAIL : STATION_WAYPOINT);
this->dest_tile = CalcClosestStationTile(v->current_order.GetDestination(), v->tile, v->current_order.IsType(OT_GOTO_STATION) ? StationType::Rail : StationType::RailWaypoint);
this->dest_station_id = v->current_order.GetDestination();
this->dest_trackdirs = INVALID_TRACKDIR_BIT;
break;

4
src/pathfinder/yapf/yapf_road.cpp
View File

@@ -242,13 +242,13 @@ public:
{
if (v->current_order.IsType(OT_GOTO_STATION)) {
this->dest_station = v->current_order.GetDestination();
this->station_type = v->IsBus() ? STATION_BUS : STATION_TRUCK;
this->station_type = v->IsBus() ? StationType::Bus : StationType::Truck;
this->dest_tile = CalcClosestStationTile(this->dest_station, v->tile, this->station_type);
this->non_artic = !v->HasArticulatedPart();
this->dest_trackdirs = INVALID_TRACKDIR_BIT;
} else if (v->current_order.IsType(OT_GOTO_WAYPOINT)) {
this->dest_station = v->current_order.GetDestination();
this->station_type = STATION_ROADWAYPOINT;
this->station_type = StationType::RoadWaypoint;
this->dest_tile = CalcClosestStationTile(this->dest_station, v->tile, this->station_type);
this->non_artic = !v->HasArticulatedPart();
this->dest_trackdirs = INVALID_TRACKDIR_BIT;

2
src/pathfinder/yapf/yapf_ship.cpp
View File

@@ -46,7 +46,7 @@ public:
{
if (v->current_order.IsType(OT_GOTO_STATION)) {
this->dest_station = v->current_order.GetDestination();
this->dest_tile = CalcClosestStationTile(this->dest_station, v->tile, STATION_DOCK);
this->dest_tile = CalcClosestStationTile(this->dest_station, v->tile, StationType::Dock);
this->dest_trackdirs = INVALID_TRACKDIR_BIT;
} else {
this->dest_station = INVALID_STATION;

2
src/pathfinder/yapf/yapf_ship_regions.cpp
View File

@@ -188,7 +188,7 @@ public:
DestinationID station_id = v->current_order.GetDestination();
const BaseStation *station = BaseStation::Get(station_id);
TileArea tile_area;
station->GetTileArea(&tile_area, STATION_DOCK);
station->GetTileArea(&tile_area, StationType::Dock);
for (const auto &tile : tile_area) {
if (IsDockingTile(tile) && IsShipDestinationTile(tile, station_id)) {
pf.AddOrigin(GetWaterRegionPatchInfo(tile));