diff options
| author | rubidium <rubidium@openttd.org> | 2008-04-06 21:54:22 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2008-04-06 21:54:22 +0000 |
| commit | 949762fc65121d152d85f82902e2a67f95546db0 (patch) | |
| tree | ac784669683066f25e2ad6020ab2249eaa0c9ca0 /src/order_gui.cpp | |
| parent | aaabd593695deb1ed514383f6bb51b5d0c8030de (diff) | |
| download | openttd-949762fc65121d152d85f82902e2a67f95546db0.tar.xz | |
(svn r12595) -Codechange: hide Order's flags in the last few cases.
Diffstat (limited to 'src/order_gui.cpp')
| -rw-r--r-- | src/order_gui.cpp | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/order_gui.cpp b/src/order_gui.cpp index 5b89299aa..de929eac2 100644 --- a/src/order_gui.cpp +++ b/src/order_gui.cpp @@ -91,22 +91,22 @@ static int GetOrderFromOrderWndPt(Window *w, int y, const Vehicle *v) return (sel <= v->num_orders && sel >= 0) ? sel : INVALID_ORDER; } -static StringID StationOrderStrings[] = { - STR_8806_GO_TO, - STR_GO_TO_TRANSFER, - STR_8807_GO_TO_UNLOAD, - STR_GO_TO_TRANSFER_UNLOAD, - STR_8808_GO_TO_LOAD, - STR_GO_TO_TRANSFER_LOAD, - STR_NULL, - STR_NULL, - STR_880A_GO_NON_STOP_TO, - STR_GO_TO_NON_STOP_TRANSFER, - STR_880B_GO_NON_STOP_TO_UNLOAD, - STR_GO_TO_NON_STOP_TRANSFER_UNLOAD, - STR_880C_GO_NON_STOP_TO_LOAD, - STR_GO_TO_NON_STOP_TRANSFER_LOAD, - STR_NULL +static StringID _station_order_strings[][7] = { + { + STR_8806_GO_TO, + STR_GO_TO_TRANSFER, + STR_8807_GO_TO_UNLOAD, + STR_GO_TO_TRANSFER_UNLOAD, + STR_8808_GO_TO_LOAD, + STR_GO_TO_TRANSFER_LOAD + }, { + STR_880A_GO_NON_STOP_TO, + STR_GO_TO_NON_STOP_TRANSFER, + STR_880B_GO_NON_STOP_TO_UNLOAD, + STR_GO_TO_NON_STOP_TRANSFER_UNLOAD, + STR_880C_GO_NON_STOP_TO_LOAD, + STR_GO_TO_NON_STOP_TRANSFER_LOAD + } }; static void DrawOrdersWindow(Window *w) @@ -201,7 +201,7 @@ static void DrawOrdersWindow(Window *w) break; case OT_GOTO_STATION: - SetDParam(1, StationOrderStrings[order->flags]); + SetDParam(1, _station_order_strings[!!order->GetNonStopType()][order->GetLoadType() | order->GetUnloadType()]); SetDParam(2, order->GetDestination()); break; |