Fix trains unnecessarily slowing down when passing waypoints

This commit is contained in:
Jonathan G Rennison
2018-10-07 11:32:15 +01:00
parent 92a5e59165
commit 2c4d3192c6

View File

@@ -2679,7 +2679,7 @@ bool ProcessOrders(Vehicle *v)
*/ */
bool Order::ShouldStopAtStation(const Vehicle *v, StationID station, bool waypoint) const bool Order::ShouldStopAtStation(const Vehicle *v, StationID station, bool waypoint) const
{ {
if (waypoint) return this->IsType(OT_GOTO_WAYPOINT) && this->dest == station; if (waypoint) return this->IsType(OT_GOTO_WAYPOINT) && this->dest == station && this->IsWaitTimetabled();
if (this->IsType(OT_LOADING_ADVANCE) && this->dest == station) return true; if (this->IsType(OT_LOADING_ADVANCE) && this->dest == station) return true;
bool is_dest_station = this->IsType(OT_GOTO_STATION) && this->dest == station; bool is_dest_station = this->IsType(OT_GOTO_STATION) && this->dest == station;