dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix timetable auto-separation with go via station orders

Browse Source
This commit is contained in:
Jonathan G Rennison
2018-05-04 00:21:43 +01:00
parent ad1c402ad8
commit 71852c3f37
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/timetable_cmd.cpp
View File

@@ -547,7 +547,7 @@ static inline bool IsOrderUsableForSeparation(const Order *order)
return false; return false;
} }
if (order->GetWaitTime() == 0 && order->IsType(OT_GOTO_STATION)) { if (order->GetWaitTime() == 0 && order->IsType(OT_GOTO_STATION) && !(order->GetNonStopType() & ONSF_NO_STOP_AT_DESTINATION_STATION)) {
// non-station orders are permitted to have 0 wait times // non-station orders are permitted to have 0 wait times
return false; return false;
} }

2
src/timetable_gui.cpp
View File

@@ -578,7 +578,7 @@ struct TimetableWindow : Window {
have_conditional = true; have_conditional = true;
if (!order->IsWaitTimetabled()) have_non_timetabled_conditional_branch = true; if (!order->IsWaitTimetabled()) have_non_timetabled_conditional_branch = true;
} else { } else {
if (order->GetWaitTime() == 0 && order->IsType(OT_GOTO_STATION)) { if (order->GetWaitTime() == 0 && order->IsType(OT_GOTO_STATION) && !(order->GetNonStopType() & ONSF_NO_STOP_AT_DESTINATION_STATION)) {
have_missing_wait = true; have_missing_wait = true;
} }
if (order->GetTravelTime() == 0 && !order->IsTravelTimetabled()) { if (order->GetTravelTime() == 0 && !order->IsTravelTimetabled()) {