diff options
| author | rubidium <rubidium@openttd.org> | 2008-04-10 17:52:48 +0000 |
|---|---|---|
| committer | rubidium <rubidium@openttd.org> | 2008-04-10 17:52:48 +0000 |
| commit | bdf606967f4a0170ee5ed57652c6533fd93b1eb9 (patch) | |
| tree | ec79d0424f78745f4d832fa5b831ef3d896a6831 | |
| parent | 4ad8b95dccc6aca8bc10477bce25dd7e676d9a55 (diff) | |
| download | openttd-bdf606967f4a0170ee5ed57652c6533fd93b1eb9.tar.xz | |
(svn r12653) -Codechange: disable load/unload dropdowns when there is a 'via' non-stop order to emphasize that loading/unloading will not be done.
| -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 56913bd66..3010b7151 100644 --- a/src/order_gui.cpp +++ b/src/order_gui.cpp @@ -147,8 +147,8 @@ static void DrawOrdersWindow(Window *w) /* non-stop only for trains */ w->SetWidgetDisabledState(ORDER_WIDGET_NON_STOP, v->type != VEH_TRAIN || order == NULL); - w->SetWidgetDisabledState(ORDER_WIDGET_FULL_LOAD, order == NULL); // full load - w->SetWidgetDisabledState(ORDER_WIDGET_UNLOAD, order == NULL); // unload + w->SetWidgetDisabledState(ORDER_WIDGET_FULL_LOAD, order == NULL || (order->GetNonStopType() & ONSF_NO_STOP_AT_DESTINATION_STATION) != 0); // full load + w->SetWidgetDisabledState(ORDER_WIDGET_UNLOAD, order == NULL || (order->GetNonStopType() & ONSF_NO_STOP_AT_DESTINATION_STATION) != 0); // unload /* Disable list of vehicles with the same shared orders if there is no list */ w->SetWidgetDisabledState(ORDER_WIDGET_SHARED_ORDER_LIST, !shared_orders || v->orders == NULL); w->SetWidgetDisabledState(ORDER_WIDGET_REFIT, order == NULL); // Refit @@ -218,7 +218,7 @@ static void DrawOrdersWindow(Window *w) SetDParam(1, STR_GO_TO_STATION); SetDParam(2, STR_ORDER_GO_TO + (v->type == VEH_TRAIN ? order->GetNonStopType() : 0)); SetDParam(3, order->GetDestination()); - SetDParam(4, _station_load_types[unload][load]); + SetDParam(4, (order->GetNonStopType() & ONSF_NO_STOP_AT_DESTINATION_STATION) ? STR_EMPTY : _station_load_types[unload][load]); } break; case OT_GOTO_DEPOT: { |