amacocian/OpenTTD
1
0
Fork 0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2026-07-24 03:56:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Codechange: Rename "non-stop" and "go via" order flags for clarity (#15398)

Browse Source
This commit is contained in:
Tyler Trahan
2026-03-24 08:52:50 -04:00
committed by GitHub
parent d9c35037d4
commit fc3b81a313
12 changed files with 40 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/timetable_gui.cpp
+2 -2
View File
@@ -110,7 +110,7 @@ static bool CanDetermineTimeTaken(const Order &order, bool travelling)
if (travelling && !order.IsTravelTimetabled()) return false;
/* No wait time but we are loading at this timetabled station */
if (!travelling && !order.IsWaitTimetabled() && order.IsType(OT_GOTO_STATION) &&
!order.GetNonStopType().Test(OrderNonStopFlag::NoDestination)) {
!order.GetNonStopType().Test(OrderNonStopFlag::GoVia)) {
return false;
}
@@ -348,7 +348,7 @@ struct TimetableWindow : Window {
if (selected % 2 != 0) {
disable = order != nullptr && (order->IsType(OT_CONDITIONAL) || order->IsType(OT_IMPLICIT));
} else {
disable = order == nullptr || ((!order->IsType(OT_GOTO_STATION) || order->GetNonStopType().Test(OrderNonStopFlag::NoDestination)) && !order->IsType(OT_CONDITIONAL));
disable = order == nullptr || ((!order->IsType(OT_GOTO_STATION) || order->GetNonStopType().Test(OrderNonStopFlag::GoVia)) && !order->IsType(OT_CONDITIONAL));
}
}
bool disable_speed = disable || selected % 2 == 0 || v->type == VEH_AIRCRAFT;