mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix: [NewGRF] Randomisation-trigger 'path reservation' did not work for waypoints.

pull/13374/head
frosch 2025-04-22 18:34:28 +02:00 committed by frosch
parent bc0eaf9ac4
commit 880a947eb3
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/pathfinder/yapf/yapf_rail.cpp
View File

@ -110,6 +110,11 @@ private:
SetSignalStateByTrackdir(tile, rev_td, SIGNAL_STATE_RED); SetSignalStateByTrackdir(tile, rev_td, SIGNAL_STATE_RED);
MarkTileDirtyByTile(tile); MarkTileDirtyByTile(tile);
} }
if (IsRailWaypointTile(tile)) {
auto *st = BaseStation::GetByTile(tile);
TriggerStationRandomisation(st, tile, StationRandomTrigger::PathReservation);
}
} }
return tile != this->res_dest_tile || td != this->res_dest_td; return tile != this->res_dest_tile || td != this->res_dest_td;

4
src/pbs.cpp
View File

@ -113,8 +113,8 @@ bool TryReserveRailTrack(TileIndex tile, Track t, bool trigger_stations)
case MP_STATION: case MP_STATION:
if (HasStationRail(tile) && !HasStationReservation(tile)) { if (HasStationRail(tile) && !HasStationReservation(tile)) {
SetRailStationReservation(tile, true); SetRailStationReservation(tile, true);
if (trigger_stations && IsRailStation(tile)) { if (trigger_stations) {
auto *st = Station::GetByTile(tile); auto *st = BaseStation::GetByTile(tile);
TriggerStationRandomisation(st, tile, StationRandomTrigger::PathReservation); TriggerStationRandomisation(st, tile, StationRandomTrigger::PathReservation);
} }
MarkTileDirtyByTile(tile); // some GRFs need redraw after reserving track MarkTileDirtyByTile(tile); // some GRFs need redraw after reserving track