diff options
| author | rubidium <rubidium@openttd.org> | 2008-04-06 15:09:45 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2008-04-06 15:09:45 +0000 |
| commit | fb1c4eccd840cd05ee3bf00c3b757829c9c72ef0 (patch) | |
| tree | 902d510152ab0f94357b64fda309b662a1637e12 /src/order_gui.cpp | |
| parent | 5d8e3adcccda4b89b03c925c5d061621df2e5e10 (diff) | |
| download | openttd-fb1c4eccd840cd05ee3bf00c3b757829c9c72ef0.tar.xz | |
(svn r12593) -Codechange: hide Order's flags in most of the code.
Diffstat (limited to 'src/order_gui.cpp')
| -rw-r--r-- | src/order_gui.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/order_gui.cpp b/src/order_gui.cpp index ffc18a602..5b89299aa 100644 --- a/src/order_gui.cpp +++ b/src/order_gui.cpp @@ -215,14 +215,14 @@ static void DrawOrdersWindow(Window *w) SetDParam(2, GetDepot(order->GetDestination())->town_index); switch (v->type) { - case VEH_TRAIN: s = (order->flags & OFB_NON_STOP) ? STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT : STR_GO_TO_TRAIN_DEPOT; break; + case VEH_TRAIN: s = (order->GetNonStopType() & OFB_NON_STOP) ? STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT : STR_GO_TO_TRAIN_DEPOT; break; case VEH_ROAD: s = STR_GO_TO_ROADVEH_DEPOT; break; case VEH_SHIP: s = STR_GO_TO_SHIP_DEPOT; break; default: break; } } - if (order->flags & OFB_FULL_LOAD) s++; /* service at */ + if (order->GetDepotOrderType() & OFB_SERVICE_IF_NEEDED) s++; /* service at */ SetDParam(1, s); if (order->IsRefit()) { @@ -235,7 +235,7 @@ static void DrawOrdersWindow(Window *w) } case OT_GOTO_WAYPOINT: - SetDParam(1, (order->flags & OFB_NON_STOP) ? STR_GO_NON_STOP_TO_WAYPOINT : STR_GO_TO_WAYPOINT); + SetDParam(1, (order->GetNonStopType() & OFB_NON_STOP) ? STR_GO_NON_STOP_TO_WAYPOINT : STR_GO_TO_WAYPOINT); SetDParam(2, order->GetDestination()); break; |