diff options
| author | rubidium <rubidium@openttd.org> | 2008-01-15 18:44:22 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2008-01-15 18:44:22 +0000 |
| commit | 576f8ad93e5eb2d2c2777ae1e448ae80e80d14ba (patch) | |
| tree | 7948f0844d640b0be32729fdeaf9be3da5453758 /src/timetable_gui.cpp | |
| parent | ab7cb0804de68b015dcc774a4fbcc82e356d2c87 (diff) | |
| download | openttd-576f8ad93e5eb2d2c2777ae1e448ae80e80d14ba.tar.xz | |
(svn r11866) -Codechange: swap OFB_* and OF_* so it conceptually in sync with other cases of *B_* vs *_* like VETSB_* and VETS_*.
Diffstat (limited to 'src/timetable_gui.cpp')
| -rw-r--r-- | src/timetable_gui.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/timetable_gui.cpp b/src/timetable_gui.cpp index 66c47f53b..29fc03316 100644 --- a/src/timetable_gui.cpp +++ b/src/timetable_gui.cpp @@ -64,7 +64,7 @@ static void DrawTimetableWindow(Window *w) w->EnableWidget(7); } else { const Order *order = GetVehicleOrder(v, (selected + 1) / 2); - bool disable = order == NULL || order->type != OT_GOTO_STATION || (_patches.new_nonstop && (order->flags & OF_NON_STOP)); + bool disable = order == NULL || order->type != OT_GOTO_STATION || (_patches.new_nonstop && (order->flags & OFB_NON_STOP)); w->SetWidgetDisabledState(6, disable); w->SetWidgetDisabledState(7, disable); @@ -104,7 +104,7 @@ static void DrawTimetableWindow(Window *w) break; case OT_GOTO_STATION: - SetDParam(0, (order->flags & OF_NON_STOP) ? STR_880C_GO_NON_STOP_TO : STR_8806_GO_TO); + SetDParam(0, (order->flags & OFB_NON_STOP) ? STR_880C_GO_NON_STOP_TO : STR_8806_GO_TO); SetDParam(1, order->dest); if (order->wait_time > 0) { @@ -124,20 +124,20 @@ static void DrawTimetableWindow(Window *w) SetDParam(1, GetDepot(order->dest)->town_index); switch (v->type) { - case VEH_TRAIN: string = (order->flags & OF_NON_STOP) ? STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT : STR_GO_TO_TRAIN_DEPOT; break; + case VEH_TRAIN: string = (order->flags & OFB_NON_STOP) ? STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT : STR_GO_TO_TRAIN_DEPOT; break; case VEH_ROAD: string = STR_9038_GO_TO_ROADVEH_DEPOT; break; case VEH_SHIP: string = STR_GO_TO_SHIP_DEPOT; break; default: break; } } - if (order->flags & OF_FULL_LOAD) string++; // Service at orders + if (order->flags & OFB_FULL_LOAD) string++; // Service at orders SetDParam(0, string); } break; case OT_GOTO_WAYPOINT: - SetDParam(0, (order->flags & OF_NON_STOP) ? STR_GO_NON_STOP_TO_WAYPOINT : STR_GO_TO_WAYPOINT); + SetDParam(0, (order->flags & OFB_NON_STOP) ? STR_GO_NON_STOP_TO_WAYPOINT : STR_GO_TO_WAYPOINT); SetDParam(1, order->dest); break; @@ -182,7 +182,7 @@ static void DrawTimetableWindow(Window *w) for (const Order *order = GetVehicleOrder(v, 0); order != NULL; order = order->next) { total_time += order->travel_time + order->wait_time; if (order->travel_time == 0) complete = false; - if (order->wait_time == 0 && order->type == OT_GOTO_STATION && !(_patches.new_nonstop && (order->flags & OF_NON_STOP))) complete = false; + if (order->wait_time == 0 && order->type == OT_GOTO_STATION && !(_patches.new_nonstop && (order->flags & OFB_NON_STOP))) complete = false; } if (total_time != 0) { |