gronod/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-06-19 11:39:35 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix: [Script] Make ScriptOrder functions aware of road waypoints (#13419)

Browse Source
This commit is contained in:
SamuXarick 2025-06-08 21:49:36 +01:00 committed by GitHub
parent 484f18f987
commit ac8b236885
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/script/api/script_order.cpp
View File

@ -35,7 +35,7 @@ static OrderType GetOrderTypeByTile(TileIndex t)
switch (::GetTileType(t)) { switch (::GetTileType(t)) {
default: break; default: break;
case MP_STATION: case MP_STATION:
if (IsBuoy(t) || IsRailWaypoint(t)) return OT_GOTO_WAYPOINT; if (IsBuoy(t) || IsRailWaypoint(t) || IsRoadWaypoint(t)) return OT_GOTO_WAYPOINT;
if (IsHangar(t)) return OT_GOTO_DEPOT; if (IsHangar(t)) return OT_GOTO_DEPOT;
return OT_GOTO_STATION; return OT_GOTO_STATION;
@ -286,8 +286,12 @@ static ScriptOrder::OrderPosition RealOrderPositionToScriptOrderPosition(Vehicle
for (TileIndex t : wp->train_station) { for (TileIndex t : wp->train_station) {
if (wp->TileBelongsToRailStation(t)) return t; if (wp->TileBelongsToRailStation(t)) return t;
} }
} else if (wp->road_waypoint_area.tile != INVALID_TILE) {
for (TileIndex t : wp->road_waypoint_area) {
if (::IsRoadWaypointTile(t) && ::GetStationIndex(t) == wp->index) return t;
} }
/* If the waypoint has no rail waypoint tiles, it must have a buoy */ }
/* If the waypoint has no rail or road waypoint tiles, it must have a buoy */
return wp->xy; return wp->xy;
} }
default: return INVALID_TILE; default: return INVALID_TILE;