--- a/src/order_gui.cpp Tue Apr 08 11:54:53 2008 +0000
+++ b/src/order_gui.cpp Sat Apr 12 21:38:49 2008 +0000
@@ -26,6 +26,9 @@
#include "settings_type.h"
#include "player_func.h"
#include "newgrf_cargo.h"
+#include "widgets/dropdown_func.h"
+#include "textbuf_gui.h"
+#include "string_func.h"
#include "table/sprites.h"
#include "table/strings.h"
@@ -40,15 +43,31 @@
ORDER_WIDGET_DELETE,
ORDER_WIDGET_NON_STOP,
ORDER_WIDGET_GOTO,
+ ORDER_WIDGET_GOTO_DROPDOWN,
ORDER_WIDGET_FULL_LOAD,
ORDER_WIDGET_UNLOAD,
ORDER_WIDGET_REFIT,
- ORDER_WIDGET_TRANSFER,
+ ORDER_WIDGET_SERVICE,
+ ORDER_WIDGET_COND_VARIABLE,
+ ORDER_WIDGET_COND_COMPARATOR,
+ ORDER_WIDGET_COND_VALUE,
+ ORDER_WIDGET_RESIZE_BAR,
ORDER_WIDGET_SHARED_ORDER_LIST,
- ORDER_WIDGET_RESIZE_BAR,
ORDER_WIDGET_RESIZE,
};
+/** Under what reason are we using the PlaceObject functionality? */
+enum OrderPlaceObjectState {
+ OPOS_GOTO,
+ OPOS_CONDITIONAL,
+};
+
+struct order_d {
+ int sel;
+ OrderPlaceObjectState goto_type;
+};
+assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(order_d));
+
/**
* Return the memorised selected order.
*
@@ -82,7 +101,7 @@
* 15 = 14 (w->widget[ORDER_WIDGET_ORDER_LIST].top) + 1 (frame-line)
* 10 = order text hight
*/
- int sel = (y - 15) / 10;
+ int sel = (y - w->widget[ORDER_WIDGET_ORDER_LIST].top - 1) / 10;
if ((uint)sel >= w->vscroll.cap) return INVALID_ORDER;
@@ -91,45 +110,125 @@
return (sel <= v->num_orders && sel >= 0) ? sel : INVALID_ORDER;
}
-static StringID _station_order_strings[][7] = {
+/** Order load types that could be given to station orders. */
+static const StringID _station_load_types[][5] = {
{
- 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_EMPTY,
+ INVALID_STRING_ID,
+ STR_ORDER_FULL_LOAD,
+ STR_ORDER_FULL_LOAD_ANY,
+ STR_ORDER_NO_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
+ STR_ORDER_UNLOAD,
+ INVALID_STRING_ID,
+ STR_ORDER_UNLOAD_FULL_LOAD,
+ STR_ORDER_UNLOAD_FULL_LOAD_ANY,
+ STR_ORDER_UNLOAD_NO_LOAD,
+ }, {
+ STR_ORDER_TRANSFER,
+ INVALID_STRING_ID,
+ STR_ORDER_TRANSFER_FULL_LOAD,
+ STR_ORDER_TRANSFER_FULL_LOAD_ANY,
+ STR_ORDER_TRANSFER_NO_LOAD,
+ }, {
+ /* Unload and transfer do not work together. */
+ INVALID_STRING_ID,
+ INVALID_STRING_ID,
+ INVALID_STRING_ID,
+ INVALID_STRING_ID,
+ }, {
+ STR_ORDER_NO_UNLOAD,
+ INVALID_STRING_ID,
+ STR_ORDER_NO_UNLOAD_FULL_LOAD,
+ STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY,
+ INVALID_STRING_ID,
}
};
+static const StringID _order_non_stop_drowdown[] = {
+ STR_ORDER_GO_TO,
+ STR_ORDER_GO_NON_STOP_TO,
+ STR_ORDER_GO_VIA,
+ STR_ORDER_GO_NON_STOP_VIA,
+ INVALID_STRING_ID
+};
+
+static const StringID _order_full_load_drowdown[] = {
+ STR_ORDER_DROP_LOAD_IF_POSSIBLE,
+ STR_EMPTY,
+ STR_ORDER_DROP_FULL_LOAD_ALL,
+ STR_ORDER_DROP_FULL_LOAD_ANY,
+ STR_ORDER_DROP_NO_LOADING,
+ INVALID_STRING_ID
+};
+
+static const StringID _order_unload_drowdown[] = {
+ STR_ORDER_DROP_UNLOAD_IF_ACCEPTED,
+ STR_ORDER_DROP_UNLOAD,
+ STR_ORDER_DROP_TRANSFER,
+ STR_EMPTY,
+ STR_ORDER_DROP_NO_UNLOADING,
+ INVALID_STRING_ID
+};
+
+static const StringID _order_goto_dropdown[] = {
+ STR_ORDER_GO_TO,
+ STR_ORDER_GO_TO_NEAREST_DEPOT,
+ STR_ORDER_CONDITIONAL,
+ INVALID_STRING_ID
+};
+
+static const StringID _order_goto_dropdown_aircraft[] = {
+ STR_ORDER_GO_TO,
+ STR_ORDER_GO_TO_NEAREST_HANGAR,
+ STR_ORDER_CONDITIONAL,
+ INVALID_STRING_ID
+};
+
+static const StringID _order_conditional_variable[] = {
+ STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE,
+ STR_ORDER_CONDITIONAL_RELIABILITY,
+ STR_ORDER_CONDITIONAL_MAX_SPEED,
+ STR_ORDER_CONDITIONAL_AGE,
+ STR_ORDER_CONDITIONAL_REQUIRES_SERVICE,
+ STR_ORDER_CONDITIONAL_UNCONDITIONALLY,
+ INVALID_STRING_ID,
+};
+
+static const StringID _order_conditional_condition[] = {
+ STR_ORDER_CONDITIONAL_COMPARATOR_EQUALS,
+ STR_ORDER_CONDITIONAL_COMPARATOR_NOT_EQUALS,
+ STR_ORDER_CONDITIONAL_COMPARATOR_LESS_THAN,
+ STR_ORDER_CONDITIONAL_COMPARATOR_LESS_EQUALS,
+ STR_ORDER_CONDITIONAL_COMPARATOR_MORE_THAN,
+ STR_ORDER_CONDITIONAL_COMPARATOR_MORE_EQUALS,
+ STR_ORDER_CONDITIONAL_COMPARATOR_IS_TRUE,
+ STR_ORDER_CONDITIONAL_COMPARATOR_IS_FALSE,
+ INVALID_STRING_ID,
+};
+
+extern uint ConvertSpeedToDisplaySpeed(uint speed);
+extern uint ConvertDisplaySpeedToSpeed(uint speed);
+
+
static void DrawOrdersWindow(Window *w)
{
- const Vehicle *v;
- const Order *order;
- StringID str;
- int sel;
- int y, i;
- bool shared_orders;
-
- v = GetVehicle(w->window_number);
-
- shared_orders = v->IsOrderListShared();
+ const Vehicle *v = GetVehicle(w->window_number);
+ bool shared_orders = v->IsOrderListShared();
SetVScrollCount(w, v->num_orders + 1);
- sel = OrderGetSel(w);
- SetDParam(2, STR_8827_FULL_LOAD);
-
- order = GetVehicleOrder(v, sel);
+ int sel = OrderGetSel(w);
+ const Order *order = GetVehicleOrder(v, sel);
if (v->owner == _local_player) {
+ /* Set the strings for the dropdown boxes. */
+ w->widget[ORDER_WIDGET_NON_STOP].data = _order_non_stop_drowdown[order == NULL ? 0 : order->GetNonStopType()];
+ w->widget[ORDER_WIDGET_FULL_LOAD].data = _order_full_load_drowdown[order == NULL ? 0 : order->GetLoadType()];
+ w->widget[ORDER_WIDGET_UNLOAD].data = _order_unload_drowdown[order == NULL ? 0 : order->GetUnloadType()];
+ w->widget[ORDER_WIDGET_COND_VARIABLE].data = _order_conditional_variable[order == NULL ? 0 : order->GetConditionVariable()];
+ w->widget[ORDER_WIDGET_COND_COMPARATOR].data = _order_conditional_condition[order == NULL ? 0 : order->GetConditionComparator()];
+
/* skip */
w->SetWidgetDisabledState(ORDER_WIDGET_SKIP, v->num_orders <= 1);
@@ -139,18 +238,23 @@
/* 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_TRANSFER, order == NULL); // transfer
+ 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
+ w->SetWidgetDisabledState(ORDER_WIDGET_SERVICE, order == NULL); // Refit
w->HideWidget(ORDER_WIDGET_REFIT); // Refit
- } else {
- w->DisableWidget(ORDER_WIDGET_TRANSFER);
+ w->HideWidget(ORDER_WIDGET_SERVICE); // Service
+
+ w->HideWidget(ORDER_WIDGET_COND_VARIABLE);
+ w->HideWidget(ORDER_WIDGET_COND_COMPARATOR);
+ w->HideWidget(ORDER_WIDGET_COND_VALUE);
}
- w->ShowWidget(ORDER_WIDGET_UNLOAD); // Unload
+ w->ShowWidget(ORDER_WIDGET_NON_STOP);
+ w->ShowWidget(ORDER_WIDGET_UNLOAD);
+ w->ShowWidget(ORDER_WIDGET_FULL_LOAD);
if (order != NULL) {
switch (order->GetType()) {
@@ -161,18 +265,35 @@
case OT_GOTO_WAYPOINT:
w->DisableWidget(ORDER_WIDGET_FULL_LOAD);
w->DisableWidget(ORDER_WIDGET_UNLOAD);
- w->DisableWidget(ORDER_WIDGET_TRANSFER);
break;
case OT_GOTO_DEPOT:
- w->DisableWidget(ORDER_WIDGET_TRANSFER);
+ w->DisableWidget(ORDER_WIDGET_FULL_LOAD);
/* Remove unload and replace it with refit */
w->HideWidget(ORDER_WIDGET_UNLOAD);
w->ShowWidget(ORDER_WIDGET_REFIT);
- SetDParam(2,STR_SERVICE);
+ w->HideWidget(ORDER_WIDGET_FULL_LOAD);
+ w->ShowWidget(ORDER_WIDGET_SERVICE);
break;
+ case OT_CONDITIONAL: {
+ w->HideWidget(ORDER_WIDGET_NON_STOP);
+ w->HideWidget(ORDER_WIDGET_UNLOAD);
+ w->HideWidget(ORDER_WIDGET_FULL_LOAD);
+ w->ShowWidget(ORDER_WIDGET_COND_VARIABLE);
+ w->ShowWidget(ORDER_WIDGET_COND_COMPARATOR);
+ w->ShowWidget(ORDER_WIDGET_COND_VALUE);
+
+ OrderConditionVariable ocv = order->GetConditionVariable();
+ w->SetWidgetDisabledState(ORDER_WIDGET_COND_COMPARATOR, ocv == OCV_UNCONDITIONALLY);
+ w->SetWidgetDisabledState(ORDER_WIDGET_COND_VALUE, ocv == OCV_REQUIRES_SERVICE || ocv == OCV_UNCONDITIONALLY);
+
+ uint value = order->GetConditionValue();
+ if (order->GetConditionVariable() == OCV_MAX_SPEED) value = ConvertSpeedToDisplaySpeed(value);
+ SetDParam(1, value);
+ } break;
+
default: // every other orders
w->DisableWidget(ORDER_WIDGET_NON_STOP);
w->DisableWidget(ORDER_WIDGET_FULL_LOAD);
@@ -183,63 +304,93 @@
SetDParam(0, v->index);
DrawWindowWidgets(w);
- y = 15;
+ int y = 15;
- i = w->vscroll.pos;
+ int i = w->vscroll.pos;
order = GetVehicleOrder(v, i);
+ StringID str;
while (order != NULL) {
str = (v->cur_order_index == i) ? STR_8805 : STR_8804;
- SetDParam(3, STR_EMPTY);
+ SetDParam(6, STR_EMPTY);
if (i - w->vscroll.pos < w->vscroll.cap) {
- SetDParam(1, 6);
-
switch (order->GetType()) {
case OT_DUMMY:
SetDParam(1, STR_INVALID_ORDER);
SetDParam(2, order->GetDestination());
break;
- case OT_GOTO_STATION:
- SetDParam(1, _station_order_strings[!!order->GetNonStopType()][order->GetLoadType() | order->GetUnloadType()]);
+ case OT_GOTO_STATION: {
+ OrderLoadFlags load = order->GetLoadType();
+ OrderUnloadFlags unload = order->GetUnloadType();
+
+ 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, (order->GetNonStopType() & ONSF_NO_STOP_AT_DESTINATION_STATION) ? STR_EMPTY : _station_load_types[unload][load]);
+ } break;
+
+ case OT_GOTO_DEPOT:
+ if (v->type == VEH_AIRCRAFT) {
+ if (order->GetDepotActionType() & ODATFB_NEAREST_DEPOT) {
+ SetDParam(1, STR_GO_TO_NEAREST_DEPOT);
+ SetDParam(3, STR_ORDER_NEAREST_HANGAR);
+ } else {
+ SetDParam(1, STR_GO_TO_HANGAR);
+ SetDParam(3, order->GetDestination());
+ }
+ SetDParam(4, STR_EMPTY);
+ } else {
+ if (order->GetDepotActionType() & ODATFB_NEAREST_DEPOT) {
+ SetDParam(1, STR_GO_TO_NEAREST_DEPOT);
+ SetDParam(3, STR_ORDER_NEAREST_DEPOT);
+ } else {
+ SetDParam(1, STR_GO_TO_DEPOT);
+ SetDParam(3, GetDepot(order->GetDestination())->town_index);
+ }
+
+ switch (v->type) {
+ case VEH_TRAIN: SetDParam(4, STR_ORDER_TRAIN_DEPOT); break;
+ case VEH_ROAD: SetDParam(4, STR_ORDER_ROAD_DEPOT); break;
+ case VEH_SHIP: SetDParam(4, STR_ORDER_SHIP_DEPOT); break;
+ default: NOT_REACHED();
+ }
+ }
+
+ if (order->GetDepotOrderType() & ODTFB_SERVICE) {
+ SetDParam(2, (order->GetNonStopType() & ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS) ? STR_ORDER_SERVICE_NON_STOP_AT : STR_ORDER_SERVICE_AT);
+ } else {
+ SetDParam(2, (order->GetNonStopType() & ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS) ? STR_ORDER_GO_NON_STOP_TO : STR_ORDER_GO_TO);
+ }
+
+ if (order->IsRefit()) {
+ SetDParam(6, STR_REFIT_ORDER);
+ SetDParam(7, GetCargo(order->GetRefitCargo())->name);
+ }
+ break;
+
+ case OT_GOTO_WAYPOINT:
+ SetDParam(1, (order->GetNonStopType() & ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS) ? STR_GO_NON_STOP_TO_WAYPOINT : STR_GO_TO_WAYPOINT);
SetDParam(2, order->GetDestination());
break;
- case OT_GOTO_DEPOT: {
- StringID s = STR_NULL;
-
- if (v->type == VEH_AIRCRAFT) {
- s = STR_GO_TO_AIRPORT_HANGAR;
- SetDParam(2, order->GetDestination());
+ case OT_CONDITIONAL:
+ SetDParam(2, order->GetConditionSkipToOrder() + 1);
+ if (order->GetConditionVariable() == OCV_UNCONDITIONALLY) {
+ SetDParam(1, STR_CONDITIONAL_UNCONDITIONAL);
} else {
- SetDParam(2, GetDepot(order->GetDestination())->town_index);
+ OrderConditionComparator occ = order->GetConditionComparator();
+ SetDParam(1, (occ == OCC_IS_TRUE || occ == OCC_IS_FALSE) ? STR_CONDITIONAL_TRUE_FALSE : STR_CONDITIONAL_NUM);
+ SetDParam(3, STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE + order->GetConditionVariable());
+ SetDParam(4, STR_ORDER_CONDITIONAL_COMPARATOR_EQUALS + occ);
- switch (v->type) {
- 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->GetDepotOrderType() & OFB_SERVICE_IF_NEEDED) s++; /* service at */
-
- SetDParam(1, s);
- if (order->IsRefit()) {
- SetDParam(3, STR_REFIT_ORDER);
- SetDParam(4, GetCargo(order->GetRefitCargo())->name);
- } else {
- SetDParam(3, STR_EMPTY);
+ uint value = order->GetConditionValue();
+ if (order->GetConditionVariable() == OCV_MAX_SPEED) value = ConvertSpeedToDisplaySpeed(value);
+ SetDParam(5, value);
}
break;
- }
- case OT_GOTO_WAYPOINT:
- SetDParam(1, (order->GetNonStopType() & OFB_NON_STOP) ? STR_GO_NON_STOP_TO_WAYPOINT : STR_GO_TO_WAYPOINT);
- SetDParam(2, order->GetDestination());
- break;
-
- default: break;
+ default: NOT_REACHED();
}
SetDParam(0, i + 1);
@@ -264,49 +415,49 @@
order.next = NULL;
order.index = 0;
- // check depot first
+ /* check depot first */
if (_patches.gotodepot) {
switch (GetTileType(tile)) {
- case MP_RAILWAY:
- if (v->type == VEH_TRAIN && IsTileOwner(tile, _local_player)) {
- if (IsRailDepot(tile)) {
- order.MakeGoToDepot(GetDepotByTile(tile)->index, true);
+ case MP_RAILWAY:
+ if (v->type == VEH_TRAIN && IsTileOwner(tile, _local_player)) {
+ if (IsRailDepot(tile)) {
+ order.MakeGoToDepot(GetDepotByTile(tile)->index, ODTFB_PART_OF_ORDERS);
+ return order;
+ }
+ }
+ break;
+
+ case MP_ROAD:
+ if (IsRoadDepot(tile) && v->type == VEH_ROAD && IsTileOwner(tile, _local_player)) {
+ order.MakeGoToDepot(GetDepotByTile(tile)->index, ODTFB_PART_OF_ORDERS);
return order;
}
- }
- break;
-
- case MP_ROAD:
- if (IsRoadDepot(tile) && v->type == VEH_ROAD && IsTileOwner(tile, _local_player)) {
- order.MakeGoToDepot(GetDepotByTile(tile)->index, true);
- return order;
- }
- break;
+ break;
- case MP_STATION:
- if (v->type != VEH_AIRCRAFT) break;
- if (IsHangar(tile) && IsTileOwner(tile, _local_player)) {
- order.MakeGoToDepot(GetStationIndex(tile), true);
- return order;
- }
- break;
+ case MP_STATION:
+ if (v->type != VEH_AIRCRAFT) break;
+ if (IsHangar(tile) && IsTileOwner(tile, _local_player)) {
+ order.MakeGoToDepot(GetStationIndex(tile), ODTFB_PART_OF_ORDERS);
+ return order;
+ }
+ break;
- case MP_WATER:
- if (v->type != VEH_SHIP) break;
- if (IsTileDepotType(tile, TRANSPORT_WATER) &&
- IsTileOwner(tile, _local_player)) {
- TileIndex tile2 = GetOtherShipDepotTile(tile);
+ case MP_WATER:
+ if (v->type != VEH_SHIP) break;
+ if (IsTileDepotType(tile, TRANSPORT_WATER) &&
+ IsTileOwner(tile, _local_player)) {
+ TileIndex tile2 = GetOtherShipDepotTile(tile);
- order.MakeGoToDepot(GetDepotByTile(tile < tile2 ? tile : tile2)->index, true);
- return order;
- }
+ order.MakeGoToDepot(GetDepotByTile(tile < tile2 ? tile : tile2)->index, ODTFB_PART_OF_ORDERS);
+ return order;
+ }
default:
break;
}
}
- // check waypoint
+ /* check waypoint */
if (IsTileType(tile, MP_RAILWAY) &&
v->type == VEH_TRAIN &&
IsTileOwner(tile, _local_player) &&
@@ -321,19 +472,20 @@
if (st->owner == _current_player || st->owner == OWNER_NONE) {
byte facil;
- (facil=FACIL_DOCK, v->type == VEH_SHIP) ||
- (facil=FACIL_TRAIN, v->type == VEH_TRAIN) ||
- (facil=FACIL_AIRPORT, v->type == VEH_AIRCRAFT) ||
- (facil=FACIL_BUS_STOP, v->type == VEH_ROAD && IsCargoInClass(v->cargo_type, CC_PASSENGERS)) ||
- (facil=FACIL_TRUCK_STOP, 1);
+ (facil = FACIL_DOCK, v->type == VEH_SHIP) ||
+ (facil = FACIL_TRAIN, v->type == VEH_TRAIN) ||
+ (facil = FACIL_AIRPORT, v->type == VEH_AIRCRAFT) ||
+ (facil = FACIL_BUS_STOP, v->type == VEH_ROAD && IsCargoInClass(v->cargo_type, CC_PASSENGERS)) ||
+ (facil = FACIL_TRUCK_STOP, 1);
if (st->facilities & facil) {
order.MakeGoToStation(st_index);
+ if (_patches.new_nonstop && v->type == VEH_TRAIN) order.SetNonStopType(ONSF_NO_STOP_AT_INTERMEDIATE_STATIONS);
return order;
}
}
}
- // not found
+ /* not found */
order.Free();
return order;
}
@@ -347,8 +499,8 @@
if (!u->IsPrimaryVehicle()) return false;
}
- // v is vehicle getting orders. Only copy/clone orders if vehicle doesn't have any orders yet
- // obviously if you press CTRL on a non-empty orders vehicle you know what you are doing
+ /* v is vehicle getting orders. Only copy/clone orders if vehicle doesn't have any orders yet
+ * obviously if you press CTRL on a non-empty orders vehicle you know what you are doing */
if (v->num_orders != 0 && _ctrl_pressed == 0) return false;
if (DoCommandP(v->tile, v->index | (u->index << 16), _ctrl_pressed ? CO_SHARE : CO_COPY, NULL,
@@ -362,14 +514,11 @@
static void OrdersPlaceObj(const Vehicle *v, TileIndex tile, Window *w)
{
- Order cmd;
- const Vehicle *u;
-
- // check if we're clicking on a vehicle first.. clone orders in that case.
- u = CheckMouseOverVehicle();
+ /* check if we're clicking on a vehicle first.. clone orders in that case. */
+ const Vehicle *u = CheckMouseOverVehicle();
if (u != NULL && HandleOrderVehClick(v, u, w)) return;
- cmd = GetOrderCmdFromTile(v, tile);
+ const Order cmd = GetOrderCmdFromTile(v, tile);
if (!cmd.IsValid()) return;
if (DoCommandP(v->tile, v->index + (OrderGetSel(w) << 16), cmd.Pack(), NULL, CMD_INSERT_ORDER | CMD_MSG(STR_8833_CAN_T_INSERT_NEW_ORDER))) {
@@ -384,13 +533,14 @@
* @param w current window
* @param v current vehicle
*/
-static void OrderClick_Goto(Window *w, const Vehicle *v)
+static void OrderClick_Goto(Window *w, const Vehicle *v, int i)
{
w->InvalidateWidget(ORDER_WIDGET_GOTO);
w->ToggleWidgetLoweredState(ORDER_WIDGET_GOTO);
if (w->IsWidgetLowered(ORDER_WIDGET_GOTO)) {
_place_clicked_vehicle = NULL;
SetObjectToPlaceWnd(ANIMCURSOR_PICKSTATION, PAL_NONE, VHM_RECT, w);
+ WP(w, order_d).goto_type = OPOS_GOTO;
} else {
ResetObjectToPlace();
}
@@ -401,10 +551,67 @@
*
* @param w current window
* @param v current vehicle
+ * @param load_type the way to load.
*/
-static void OrderClick_FullLoad(Window *w, const Vehicle *v)
+static void OrderClick_FullLoad(Window *w, const Vehicle *v, int load_type)
{
- DoCommandP(v->tile, v->index + (OrderGetSel(w) << 16), OF_FULL_LOAD, NULL, CMD_MODIFY_ORDER | CMD_MSG(STR_8835_CAN_T_MODIFY_THIS_ORDER));
+ VehicleOrderID sel_ord = OrderGetSel(w);
+ const Order *order = GetVehicleOrder(v, sel_ord);
+
+ if (order->GetLoadType() == load_type) return;
+
+ if (load_type < 0) {
+ switch (order->GetLoadType()) {
+ case OLF_LOAD_IF_POSSIBLE: load_type = OLFB_FULL_LOAD; break;
+ case OLFB_FULL_LOAD: load_type = OLF_FULL_LOAD_ANY; break;
+ case OLF_FULL_LOAD_ANY: load_type = OLFB_NO_LOAD; break;
+ case OLFB_NO_LOAD: load_type = OLF_LOAD_IF_POSSIBLE; break;
+ default: NOT_REACHED();
+ }
+ }
+ DoCommandP(v->tile, v->index + (sel_ord << 16), MOF_LOAD | (load_type << 4), NULL, CMD_MODIFY_ORDER | CMD_MSG(STR_8835_CAN_T_MODIFY_THIS_ORDER));
+}
+
+/**
+ * Handle the click on the service.
+ *
+ * @param w current window
+ * @param v current vehicle
+ */
+static void OrderClick_Service(Window *w, const Vehicle *v, int i)
+{
+ DoCommandP(v->tile, v->index + (OrderGetSel(w) << 16), MOF_DEPOT_ACTION, NULL, CMD_MODIFY_ORDER | CMD_MSG(STR_8835_CAN_T_MODIFY_THIS_ORDER));
+}
+
+/**
+ * Handle the click on the service in nearest depot button.
+ *
+ * @param w current window
+ * @param v current vehicle
+ */
+static void OrderClick_NearestDepot(Window *w, const Vehicle *v, int i)
+{
+ Order order;
+ order.next = NULL;
+ order.index = 0;
+ order.MakeGoToDepot(0, ODTFB_PART_OF_ORDERS);
+ order.SetDepotActionType(ODATFB_NEAREST_DEPOT);
+
+ DoCommandP(v->tile, v->index + (OrderGetSel(w) << 16), order.Pack(), NULL, CMD_INSERT_ORDER | CMD_MSG(STR_8833_CAN_T_INSERT_NEW_ORDER));
+}
+
+/**
+ * Handle the click on the conditional order button.
+ *
+ * @param w current window
+ * @param v current vehicle
+ */
+static void OrderClick_Conditional(Window *w, const Vehicle *v, int i)
+{
+ w->InvalidateWidget(ORDER_WIDGET_GOTO);
+ w->LowerWidget(ORDER_WIDGET_GOTO);
+ SetObjectToPlaceWnd(ANIMCURSOR_PICKSTATION, PAL_NONE, VHM_RECT, w);
+ WP(w, order_d).goto_type = OPOS_CONDITIONAL;
}
/**
@@ -413,9 +620,24 @@
* @param w current window
* @param v current vehicle
*/
-static void OrderClick_Unload(Window *w, const Vehicle *v)
+static void OrderClick_Unload(Window *w, const Vehicle *v, int unload_type)
{
- DoCommandP(v->tile, v->index + (OrderGetSel(w) << 16), OF_UNLOAD, NULL, CMD_MODIFY_ORDER | CMD_MSG(STR_8835_CAN_T_MODIFY_THIS_ORDER));
+ VehicleOrderID sel_ord = OrderGetSel(w);
+ const Order *order = GetVehicleOrder(v, sel_ord);
+
+ if (order->GetUnloadType() == unload_type) return;
+
+ if (unload_type < 0) {
+ switch (order->GetUnloadType()) {
+ case OUF_UNLOAD_IF_POSSIBLE: unload_type = OUFB_UNLOAD; break;
+ case OUFB_UNLOAD: unload_type = OUFB_TRANSFER; break;
+ case OUFB_TRANSFER: unload_type = OUFB_NO_UNLOAD; break;
+ case OUFB_NO_UNLOAD: unload_type = OUF_UNLOAD_IF_POSSIBLE; break;
+ default: NOT_REACHED();
+ }
+ }
+
+ DoCommandP(v->tile, v->index + (sel_ord << 16), MOF_UNLOAD | (unload_type << 4), NULL, CMD_MODIFY_ORDER | CMD_MSG(STR_8835_CAN_T_MODIFY_THIS_ORDER));
}
/**
@@ -423,10 +645,21 @@
*
* @param w current window
* @param v current vehicle
+ * @param non_stop what non-stop type to use; -1 to use the 'next' one.
*/
-static void OrderClick_Nonstop(Window *w, const Vehicle *v)
+static void OrderClick_Nonstop(Window *w, const Vehicle *v, int non_stop)
{
- DoCommandP(v->tile, v->index + (OrderGetSel(w) << 16), OF_NON_STOP, NULL, CMD_MODIFY_ORDER | CMD_MSG(STR_8835_CAN_T_MODIFY_THIS_ORDER));
+ VehicleOrderID sel_ord = OrderGetSel(w);
+ const Order *order = GetVehicleOrder(v, sel_ord);
+
+ if (order->GetNonStopType() == non_stop) return;
+
+ /* Keypress if negative, so 'toggle' to the next */
+ if (non_stop < 0) {
+ non_stop = (order->GetNonStopType() + 1) % ONSF_END;
+ }
+
+ DoCommandP(v->tile, v->index + (sel_ord << 16), MOF_NON_STOP | non_stop << 4, NULL, CMD_MODIFY_ORDER | CMD_MSG(STR_8835_CAN_T_MODIFY_THIS_ORDER));
}
/**
@@ -435,9 +668,12 @@
* @param w current window
* @param v current vehicle
*/
-static void OrderClick_Transfer(Window* w, const Vehicle* v)
+static void OrderClick_Transfer(Window *w, const Vehicle *v, int i)
{
- DoCommandP(v->tile, v->index + (OrderGetSel(w) << 16), OF_TRANSFER, NULL, CMD_MODIFY_ORDER | CMD_MSG(STR_8835_CAN_T_MODIFY_THIS_ORDER));
+ VehicleOrderID sel_ord = OrderGetSel(w);
+ const Order *order = GetVehicleOrder(v, sel_ord);
+
+ DoCommandP(v->tile, v->index + (sel_ord << 16), MOF_UNLOAD | ((order->GetUnloadType() & ~OUFB_NO_UNLOAD) ^ OUFB_TRANSFER) << 4, NULL, CMD_MODIFY_ORDER | CMD_MSG(STR_8835_CAN_T_MODIFY_THIS_ORDER));
}
/**
@@ -448,7 +684,7 @@
* @param w current window
* @param v current vehicle
*/
-static void OrderClick_Skip(Window *w, const Vehicle *v)
+static void OrderClick_Skip(Window *w, const Vehicle *v, int i)
{
/* Don't skip when there's nothing to skip */
if (_ctrl_pressed && v->cur_order_index == OrderGetSel(w)) return;
@@ -463,7 +699,7 @@
* @param w current window
* @param v current vehicle
*/
-static void OrderClick_Delete(Window *w, const Vehicle *v)
+static void OrderClick_Delete(Window *w, const Vehicle *v, int i)
{
DoCommandP(v->tile, v->index, OrderGetSel(w), NULL, CMD_DELETE_ORDER | CMD_MSG(STR_8834_CAN_T_DELETE_THIS_ORDER));
}
@@ -476,7 +712,7 @@
* @param w current window
* @param v current vehicle
*/
-static void OrderClick_Refit(Window *w, const Vehicle *v)
+static void OrderClick_Refit(Window *w, const Vehicle *v, int i)
{
if (_ctrl_pressed) {
/* Cancel refitting */
@@ -486,7 +722,7 @@
}
}
-typedef void OnButtonVehClick(Window *w, const Vehicle *v);
+typedef void OnButtonVehClick(Window *w, const Vehicle *v, int i);
/**
* Keycode function mapping.
@@ -501,7 +737,8 @@
OrderClick_Goto,
OrderClick_FullLoad,
OrderClick_Unload,
- OrderClick_Transfer
+ OrderClick_Transfer,
+ OrderClick_Service,
};
static const uint16 _order_keycodes[] = {
@@ -515,20 +752,10 @@
static void OrdersWndProc(Window *w, WindowEvent *e)
{
+ const Vehicle *v = GetVehicle(w->window_number);
+
switch (e->event) {
case WE_CREATE:
- /* Ensure that the refit and unload buttons always remain at the same location.
- * Only one of them can be active at any one time and takes turns on being disabled.
- * To ensure that they stay at the same location, we also verify that they behave the same
- * when resizing. */
- if (GetVehicle(w->window_number)->owner == _local_player) { // only the vehicle owner got these buttons
- assert(w->widget[ORDER_WIDGET_REFIT].left == w->widget[ORDER_WIDGET_UNLOAD].left);
- assert(w->widget[ORDER_WIDGET_REFIT].right == w->widget[ORDER_WIDGET_UNLOAD].right);
- assert(w->widget[ORDER_WIDGET_REFIT].top == w->widget[ORDER_WIDGET_UNLOAD].top);
- assert(w->widget[ORDER_WIDGET_REFIT].bottom == w->widget[ORDER_WIDGET_UNLOAD].bottom);
- assert(w->widget[ORDER_WIDGET_REFIT].display_flags == w->widget[ORDER_WIDGET_UNLOAD].display_flags);
- }
-
if (_patches.timetabling) {
w->widget[ORDER_WIDGET_CAPTION].right -= 61;
} else {
@@ -537,193 +764,272 @@
break;
- case WE_PAINT:
- DrawOrdersWindow(w);
- break;
+ case WE_PAINT:
+ DrawOrdersWindow(w);
+ break;
- case WE_CLICK: {
- const Vehicle *v = GetVehicle(w->window_number);
- switch (e->we.click.widget) {
- case ORDER_WIDGET_ORDER_LIST: {
- ResetObjectToPlace();
+ case WE_CLICK:
+ if (w->widget[e->we.click.widget].type != WWT_DROPDOWN) HideDropDownMenu(w);
+ switch (e->we.click.widget) {
+ case ORDER_WIDGET_ORDER_LIST: {
+ ResetObjectToPlace();
- int sel = GetOrderFromOrderWndPt(w, e->we.click.pt.y, v);
+ int sel = GetOrderFromOrderWndPt(w, e->we.click.pt.y, v);
- if (sel == INVALID_ORDER) {
- /* This was a click on an empty part of the orders window, so
- * deselect the currently selected order. */
- WP(w, order_d).sel = -1;
- SetWindowDirty(w);
- return;
+ if (sel == INVALID_ORDER) {
+ /* This was a click on an empty part of the orders window, so
+ * deselect the currently selected order. */
+ WP(w, order_d).sel = -1;
+ SetWindowDirty(w);
+ return;
+ }
+
+ if (_ctrl_pressed && sel < v->num_orders) {
+ const Order *ord = GetVehicleOrder(v, sel);
+ TileIndex xy;
+
+ switch (ord->GetType()) {
+ case OT_GOTO_STATION: xy = GetStation(ord->GetDestination())->xy ; break;
+ case OT_GOTO_DEPOT: xy = (v->type == VEH_AIRCRAFT) ? GetStation(ord->GetDestination())->xy : GetDepot(ord->GetDestination())->xy; break;
+ case OT_GOTO_WAYPOINT: xy = GetWaypoint(ord->GetDestination())->xy; break;
+ default: xy = 0; break;
+ }
+
+ if (xy != 0) ScrollMainWindowToTile(xy);
+ return;
+ } else {
+ if (sel == WP(w, order_d).sel) {
+ /* Deselect clicked order */
+ WP(w, order_d).sel = -1;
+ } else {
+ /* Select clicked order */
+ WP(w, order_d).sel = sel;
+
+ if (v->owner == _local_player) {
+ /* Activate drag and drop */
+ SetObjectToPlaceWnd(SPR_CURSOR_MOUSE, PAL_NONE, VHM_DRAG, w);
+ }
+ }
+ }
+
+ SetWindowDirty(w);
+ } break;
+
+ case ORDER_WIDGET_SKIP:
+ OrderClick_Skip(w, v, 0);
+ break;
+
+ case ORDER_WIDGET_DELETE:
+ OrderClick_Delete(w, v, 0);
+ break;
+
+ case ORDER_WIDGET_NON_STOP: {
+ const Order *o = GetVehicleOrder(v, OrderGetSel(w));
+ ShowDropDownMenu(w, _order_non_stop_drowdown, o->GetNonStopType(), ORDER_WIDGET_NON_STOP, 0, o->IsType(OT_GOTO_STATION) ? 0 : (o->IsType(OT_GOTO_WAYPOINT) ? 3 : 12));
+ } break;
+
+ case ORDER_WIDGET_GOTO:
+ OrderClick_Goto(w, v, 0);
+ break;
+
+ case ORDER_WIDGET_GOTO_DROPDOWN:
+ ShowDropDownMenu(w, v->type == VEH_AIRCRAFT ? _order_goto_dropdown_aircraft : _order_goto_dropdown, 0, ORDER_WIDGET_GOTO, 0, 0, w->widget[ORDER_WIDGET_GOTO_DROPDOWN].right - w->widget[ORDER_WIDGET_GOTO].left);
+ break;
+
+ case ORDER_WIDGET_FULL_LOAD:
+ ShowDropDownMenu(w, _order_full_load_drowdown, GetVehicleOrder(v, OrderGetSel(w))->GetLoadType(), ORDER_WIDGET_FULL_LOAD, 0, 2);
+ break;
+
+ case ORDER_WIDGET_UNLOAD:
+ ShowDropDownMenu(w, _order_unload_drowdown, GetVehicleOrder(v, OrderGetSel(w))->GetUnloadType(), ORDER_WIDGET_UNLOAD, 0, 8);
+ break;
+
+ case ORDER_WIDGET_REFIT:
+ OrderClick_Refit(w, v, 0);
+ break;
+
+ case ORDER_WIDGET_SERVICE:
+ OrderClick_Service(w, v, 0);
+ break;
+
+ case ORDER_WIDGET_TIMETABLE_VIEW:
+ ShowTimetableWindow(v);
+ break;
+
+ case ORDER_WIDGET_COND_VARIABLE:
+ ShowDropDownMenu(w, _order_conditional_variable, GetVehicleOrder(v, OrderGetSel(w))->GetConditionVariable(), ORDER_WIDGET_COND_VARIABLE, 0, 0);
+ break;
+
+ case ORDER_WIDGET_COND_COMPARATOR: {
+ const Order *o = GetVehicleOrder(v, OrderGetSel(w));
+ ShowDropDownMenu(w, _order_conditional_condition, o->GetConditionComparator(), ORDER_WIDGET_COND_COMPARATOR, 0, (o->GetConditionVariable() == OCV_REQUIRES_SERVICE) ? 0x3F : 0xC0);
+ } break;
+
+ case ORDER_WIDGET_COND_VALUE: {
+ const Order *order = GetVehicleOrder(v, OrderGetSel(w));
+ uint value = order->GetConditionValue();
+ if (order->GetConditionVariable() == OCV_MAX_SPEED) value = ConvertSpeedToDisplaySpeed(value);
+ SetDParam(0, value);
+ ShowQueryString(STR_CONFIG_PATCHES_INT32, STR_ORDER_CONDITIONAL_VALUE_CAPT, 5, 100, w, CS_NUMERAL);
+ } break;
+
+ case ORDER_WIDGET_SHARED_ORDER_LIST:
+ ShowVehicleListWindow(v);
+ break;
+ }
+ break;
+
+ case WE_ON_EDIT_TEXT:
+ if (!StrEmpty(e->we.edittext.str)) {
+ VehicleOrderID sel = OrderGetSel(w);
+ uint value = atoi(e->we.edittext.str);
+
+ switch (GetVehicleOrder(v, sel)->GetConditionVariable()) {
+ case OCV_MAX_SPEED:
+ value = ConvertDisplaySpeedToSpeed(value);
+ break;
+
+ case OCV_RELIABILITY:
+ case OCV_LOAD_PERCENTAGE:
+ value = Clamp(value, 0, 100);
+
+ default:
+ break;
+ }
+ DoCommandP(v->tile, v->index + (sel << 16), MOF_COND_VALUE | Clamp(value, 0, 2047) << 4, NULL, CMD_MODIFY_ORDER | CMD_MSG(STR_8835_CAN_T_MODIFY_THIS_ORDER));
+ }
+ break;
+
+ case WE_DROPDOWN_SELECT: // we have selected a dropdown item in the list
+ switch (e->we.dropdown.button) {
+ case ORDER_WIDGET_NON_STOP:
+ OrderClick_Nonstop(w, v, e->we.dropdown.index);
+ break;
+
+ case ORDER_WIDGET_FULL_LOAD:
+ OrderClick_FullLoad(w, v, e->we.dropdown.index);
+ break;
+
+ case ORDER_WIDGET_UNLOAD:
+ OrderClick_Unload(w, v, e->we.dropdown.index);
+ break;
+
+ case ORDER_WIDGET_GOTO:
+ switch (e->we.dropdown.index) {
+ case 0:
+ w->ToggleWidgetLoweredState(ORDER_WIDGET_GOTO);
+ OrderClick_Goto(w, v, 0);
+ break;
+
+ case 1: OrderClick_NearestDepot(w, v, 0); break;
+ case 2: OrderClick_Conditional(w, v, 0); break;
+ default: NOT_REACHED();
+ }
+ break;
+
+ case ORDER_WIDGET_COND_VARIABLE:
+ DoCommandP(v->tile, v->index + (OrderGetSel(w) << 16), MOF_COND_VARIABLE | e->we.dropdown.index << 4, NULL, CMD_MODIFY_ORDER | CMD_MSG(STR_8835_CAN_T_MODIFY_THIS_ORDER));
+ break;
+
+ case ORDER_WIDGET_COND_COMPARATOR:
+ DoCommandP(v->tile, v->index + (OrderGetSel(w) << 16), MOF_COND_COMPARATOR | e->we.dropdown.index << 4, NULL, CMD_MODIFY_ORDER | CMD_MSG(STR_8835_CAN_T_MODIFY_THIS_ORDER));
+ break;
+ }
+ break;
+
+ case WE_DRAGDROP:
+ switch (e->we.click.widget) {
+ case ORDER_WIDGET_ORDER_LIST: {
+ int from_order = OrderGetSel(w);
+ int to_order = GetOrderFromOrderWndPt(w, e->we.dragdrop.pt.y, v);
+
+ if (!(from_order == to_order || from_order == INVALID_ORDER || from_order > v->num_orders || to_order == INVALID_ORDER || to_order > v->num_orders) &&
+ DoCommandP(v->tile, v->index, from_order | (to_order << 16), NULL, CMD_MOVE_ORDER | CMD_MSG(STR_CAN_T_MOVE_THIS_ORDER))) {
+ WP(w, order_d).sel = -1;
+ }
+
+ } break;
+
+ case ORDER_WIDGET_DELETE:
+ OrderClick_Delete(w, v, 0);
+ break;
}
- if (_ctrl_pressed && sel < v->num_orders) {
- const Order *ord = GetVehicleOrder(v, sel);
- TileIndex xy;
-
- switch (ord->GetType()) {
- case OT_GOTO_STATION: xy = GetStation(ord->GetDestination())->xy ; break;
- case OT_GOTO_DEPOT: xy = (v->type == VEH_AIRCRAFT) ? GetStation(ord->GetDestination())->xy : GetDepot(ord->GetDestination())->xy; break;
- case OT_GOTO_WAYPOINT: xy = GetWaypoint(ord->GetDestination())->xy; break;
- default: xy = 0; break;
- }
+ ResetObjectToPlace();
+ break;
- if (xy != 0) ScrollMainWindowToTile(xy);
- return;
- } else {
- if (sel == WP(w, order_d).sel) {
- /* Deselect clicked order */
- WP(w, order_d).sel = -1;
- } else {
- /* Select clicked order */
- WP(w, order_d).sel = sel;
+ case WE_KEYPRESS:
+ if (v->owner != _local_player) break;
- if (v->owner == _local_player) {
- /* Activate drag and drop */
- SetObjectToPlaceWnd(SPR_CURSOR_MOUSE, PAL_NONE, VHM_DRAG, w);
+ for (uint i = 0; i < lengthof(_order_keycodes); i++) {
+ if (e->we.keypress.keycode == _order_keycodes[i]) {
+ e->we.keypress.cont = false;
+ /* see if the button is disabled */
+ if (!w->IsWidgetDisabled(i + ORDER_WIDGET_SKIP)) _order_button_proc[i](w, v, -1);
+ break;
+ }
+ }
+ break;
+
+ case WE_PLACE_OBJ:
+ if (WP(w, order_d).goto_type == OPOS_GOTO) {
+ OrdersPlaceObj(GetVehicle(w->window_number), e->we.place.tile, w);
+ }
+ break;
+
+ case WE_ABORT_PLACE_OBJ:
+ if (WP(w, order_d).goto_type == OPOS_CONDITIONAL) {
+ WP(w, order_d).goto_type = OPOS_GOTO;
+ if (_cursor.pos.x >= (w->left + w->widget[ORDER_WIDGET_ORDER_LIST].left) &&
+ _cursor.pos.y >= (w->top + w->widget[ORDER_WIDGET_ORDER_LIST].top) &&
+ _cursor.pos.x <= (w->left + w->widget[ORDER_WIDGET_ORDER_LIST].right) &&
+ _cursor.pos.y <= (w->top + w->widget[ORDER_WIDGET_ORDER_LIST].bottom)) {
+ int order_id = GetOrderFromOrderWndPt(w, _cursor.pos.y - w->top, v);
+ if (order_id != INVALID_ORDER) {
+ Order order;
+ order.next = NULL;
+ order.index = 0;
+ order.MakeConditional(order_id);
+
+ DoCommandP(v->tile, v->index + (OrderGetSel(w) << 16), order.Pack(), NULL, CMD_INSERT_ORDER | CMD_MSG(STR_8833_CAN_T_INSERT_NEW_ORDER));
}
}
}
-
- SetWindowDirty(w);
- } break;
-
- case ORDER_WIDGET_SKIP:
- OrderClick_Skip(w, v);
- break;
-
- case ORDER_WIDGET_DELETE:
- OrderClick_Delete(w, v);
- break;
-
- case ORDER_WIDGET_NON_STOP:
- OrderClick_Nonstop(w, v);
- break;
-
- case ORDER_WIDGET_GOTO:
- OrderClick_Goto(w, v);
- break;
-
- case ORDER_WIDGET_FULL_LOAD:
- OrderClick_FullLoad(w, v);
- break;
-
- case ORDER_WIDGET_UNLOAD:
- OrderClick_Unload(w, v);
- break;
- case ORDER_WIDGET_REFIT:
- OrderClick_Refit(w, v);
- break;
-
- case ORDER_WIDGET_TRANSFER:
- OrderClick_Transfer(w, v);
- break;
-
- case ORDER_WIDGET_TIMETABLE_VIEW:
- ShowTimetableWindow(v);
+ w->RaiseWidget(ORDER_WIDGET_GOTO);
+ w->InvalidateWidget(ORDER_WIDGET_GOTO);
break;
- case ORDER_WIDGET_SHARED_ORDER_LIST:
- ShowVehicleListWindow(v);
- break;
- }
- } break;
-
- case WE_DRAGDROP: {
- const Vehicle *v = GetVehicle(w->window_number);
-
- switch (e->we.click.widget) {
- case ORDER_WIDGET_ORDER_LIST: {
- int from_order = OrderGetSel(w);
- int to_order = GetOrderFromOrderWndPt(w, e->we.dragdrop.pt.y, v);
-
- if (!(from_order == to_order || from_order == INVALID_ORDER || from_order > v->num_orders || to_order == INVALID_ORDER || to_order > v->num_orders) &&
- DoCommandP(v->tile, v->index, from_order | (to_order << 16), NULL, CMD_MOVE_ORDER | CMD_MSG(STR_CAN_T_MOVE_THIS_ORDER))) {
- WP(w, order_d).sel = -1;
- }
-
- break;
+ /* check if a vehicle in a depot was clicked.. */
+ case WE_MOUSELOOP:
+ v = _place_clicked_vehicle;
+ /*
+ * Check if we clicked on a vehicle
+ * and if the GOTO button of this window is pressed
+ * This is because of all open order windows WE_MOUSELOOP is called
+ * and if you have 3 windows open, and this check is not done
+ * the order is copied to the last open window instead of the
+ * one where GOTO is enabled
+ */
+ if (v != NULL && w->IsWidgetLowered(ORDER_WIDGET_GOTO)) {
+ _place_clicked_vehicle = NULL;
+ HandleOrderVehClick(GetVehicle(w->window_number), v, w);
}
-
- case ORDER_WIDGET_DELETE:
- OrderClick_Delete(w, v);
- break;
- }
-
- ResetObjectToPlace();
- break;
- }
-
- case WE_KEYPRESS: {
- Vehicle *v = GetVehicle(w->window_number);
- uint i;
-
- if (v->owner != _local_player) break;
-
- for (i = 0; i < lengthof(_order_keycodes); i++) {
- if (e->we.keypress.keycode == _order_keycodes[i]) {
- e->we.keypress.cont = false;
- //see if the button is disabled
- if (!w->IsWidgetDisabled(i + ORDER_WIDGET_SKIP)) _order_button_proc[i](w, v);
- break;
- }
- }
- break;
- }
+ break;
- case WE_RCLICK: {
- const Vehicle *v = GetVehicle(w->window_number);
- int s = OrderGetSel(w);
-
- if (e->we.click.widget != ORDER_WIDGET_FULL_LOAD) break;
- if (s == v->num_orders || !GetVehicleOrder(v, s)->IsType(OT_GOTO_DEPOT)) {
- GuiShowTooltips(STR_8857_MAKE_THE_HIGHLIGHTED_ORDER);
- } else {
- GuiShowTooltips(STR_SERVICE_HINT);
- }
- } break;
-
- case WE_PLACE_OBJ: {
- OrdersPlaceObj(GetVehicle(w->window_number), e->we.place.tile, w);
- } break;
-
- case WE_ABORT_PLACE_OBJ: {
- w->RaiseWidget(ORDER_WIDGET_GOTO);
- w->InvalidateWidget(ORDER_WIDGET_GOTO);
- } break;
+ case WE_RESIZE:
+ /* Update the scroll + matrix */
+ w->vscroll.cap = (w->widget[ORDER_WIDGET_ORDER_LIST].bottom - w->widget[ORDER_WIDGET_ORDER_LIST].top) / 10;
+ break;
- // check if a vehicle in a depot was clicked..
- case WE_MOUSELOOP: {
- const Vehicle *v = _place_clicked_vehicle;
- /*
- * Check if we clicked on a vehicle
- * and if the GOTO button of this window is pressed
- * This is because of all open order windows WE_MOUSELOOP is called
- * and if you have 3 windows open, and this check is not done
- * the order is copied to the last open window instead of the
- * one where GOTO is enabled
- */
- if (v != NULL && w->IsWidgetLowered(ORDER_WIDGET_GOTO)) {
- _place_clicked_vehicle = NULL;
- HandleOrderVehClick(GetVehicle(w->window_number), v, w);
- }
- } break;
-
- case WE_RESIZE:
- /* Update the scroll + matrix */
- w->vscroll.cap = (w->widget[ORDER_WIDGET_ORDER_LIST].bottom - w->widget[ORDER_WIDGET_ORDER_LIST].top) / 10;
- break;
-
- case WE_TIMEOUT: { // handle button unclick ourselves...
- // unclick all buttons except for the 'goto' button (ORDER_WIDGET_GOTO), which is 'persistent'
- uint i;
- for (i = 0; i < w->widget_count; i++) {
- if (w->IsWidgetLowered(i) && i != ORDER_WIDGET_GOTO) {
- w->RaiseWidget(i);
- w->InvalidateWidget(i);
+ case WE_TIMEOUT: // handle button unclick ourselves...
+ /* unclick all buttons except for the 'goto' button (ORDER_WIDGET_GOTO), which is 'persistent' */
+ for (uint i = 0; i < w->widget_count; i++) {
+ if (w->IsWidgetLowered(i) && i != ORDER_WIDGET_GOTO) {
+ w->RaiseWidget(i);
+ w->InvalidateWidget(i);
+ }
}
- }
- } break;
+ break;
}
}
@@ -732,32 +1038,36 @@
*/
static const Widget _orders_train_widgets[] = {
{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, // ORDER_WIDGET_CLOSEBOX
- { WWT_CAPTION, RESIZE_RIGHT, 14, 11, 398, 0, 13, STR_8829_ORDERS, STR_018C_WINDOW_TITLE_DRAG_THIS}, // ORDER_WIDGET_CAPTION
- { WWT_PUSHTXTBTN, RESIZE_LR, 14, 338, 398, 0, 13, STR_TIMETABLE_VIEW, STR_TIMETABLE_VIEW_TOOLTIP}, // ORDER_WIDGET_TIMETABLE_VIEW
-
- { WWT_PANEL, RESIZE_RB, 14, 0, 386, 14, 75, 0x0, STR_8852_ORDERS_LIST_CLICK_ON_ORDER}, // ORDER_WIDGET_ORDER_LIST
-
- { WWT_SCROLLBAR, RESIZE_LRB, 14, 387, 398, 14, 75, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST}, // ORDER_WIDGET_SCROLLBAR
+ { WWT_CAPTION, RESIZE_RIGHT, 14, 11, 385, 0, 13, STR_8829_ORDERS, STR_018C_WINDOW_TITLE_DRAG_THIS}, // ORDER_WIDGET_CAPTION
+ { WWT_PUSHTXTBTN, RESIZE_LR, 14, 325, 385, 0, 13, STR_TIMETABLE_VIEW, STR_TIMETABLE_VIEW_TOOLTIP}, // ORDER_WIDGET_TIMETABLE_VIEW
- { WWT_PUSHTXTBTN, RESIZE_TB, 14, 0, 52, 76, 87, STR_8823_SKIP, STR_8853_SKIP_THE_CURRENT_ORDER}, // ORDER_WIDGET_SKIP
- { WWT_PUSHTXTBTN, RESIZE_TB, 14, 53, 105, 76, 87, STR_8824_DELETE, STR_8854_DELETE_THE_HIGHLIGHTED}, // ORDER_WIDGET_DELETE
- { WWT_PUSHTXTBTN, RESIZE_TB, 14, 106, 158, 76, 87, STR_8825_NON_STOP, STR_8855_MAKE_THE_HIGHLIGHTED_ORDER}, // ORDER_WIDGET_NON_STOP
- { WWT_TEXTBTN, RESIZE_TB, 14, 159, 211, 76, 87, STR_8826_GO_TO, STR_8856_INSERT_A_NEW_ORDER_BEFORE}, // ORDER_WIDGET_GOTO
- { WWT_PUSHTXTBTN, RESIZE_TB, 14, 212, 264, 76, 87, STR_FULLLOAD_OR_SERVICE, STR_NULL}, // ORDER_WIDGET_FULL_LOAD
- { WWT_PUSHTXTBTN, RESIZE_TB, 14, 265, 319, 76, 87, STR_8828_UNLOAD, STR_8858_MAKE_THE_HIGHLIGHTED_ORDER}, // ORDER_WIDGET_UNLOAD
- { WWT_PUSHTXTBTN, RESIZE_TB, 14, 265, 319, 76, 87, STR_REFIT, STR_REFIT_TIP}, // ORDER_WIDGET_REFIT
- { WWT_PUSHTXTBTN, RESIZE_TB, 14, 320, 372, 76, 87, STR_TRANSFER, STR_MAKE_THE_HIGHLIGHTED_ORDER}, // ORDER_WIDGET_TRANSFER
+ { WWT_PANEL, RESIZE_RB, 14, 0, 373, 14, 75, 0x0, STR_8852_ORDERS_LIST_CLICK_ON_ORDER}, // ORDER_WIDGET_ORDER_LIST
- { WWT_PUSHIMGBTN, RESIZE_TB, 14, 373, 386, 76, 87, SPR_SHARED_ORDERS_ICON, STR_VEH_WITH_SHARED_ORDERS_LIST_TIP}, // ORDER_WIDGET_SHARED_ORDER_LIST
+ { WWT_SCROLLBAR, RESIZE_LRB, 14, 374, 385, 14, 75, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST}, // ORDER_WIDGET_SCROLLBAR
- { WWT_PANEL, RESIZE_RTB, 14, 387, 386, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_RESIZE_BAR
+ { WWT_PUSHTXTBTN, RESIZE_TB, 14, 0, 123, 88, 99, STR_8823_SKIP, STR_8853_SKIP_THE_CURRENT_ORDER}, // ORDER_WIDGET_SKIP
+ { WWT_PUSHTXTBTN, RESIZE_TB, 14, 124, 247, 88, 99, STR_8824_DELETE, STR_8854_DELETE_THE_HIGHLIGHTED}, // ORDER_WIDGET_DELETE
+ { WWT_DROPDOWN, RESIZE_TB, 14, 0, 123, 76, 87, STR_NULL, STR_ORDER_TOOLTIP_NON_STOP}, // ORDER_WIDGET_NON_STOP
+ { WWT_TEXTBTN, RESIZE_TB, 14, 248, 359, 88, 99, STR_8826_GO_TO, STR_8856_INSERT_A_NEW_ORDER_BEFORE}, // ORDER_WIDGET_GOTO
+ { WWT_DROPDOWN, RESIZE_TB, 14, 360, 371, 88, 99, STR_EMPTY, STR_ORDER_GO_TO_DROPDOWN_TOOLTIP}, // ORDER_WIDGET_GOTO_DROPDOWN
+ { WWT_DROPDOWN, RESIZE_TB, 14, 124, 247, 76, 87, STR_NULL, STR_ORDER_TOOLTIP_FULL_LOAD}, // ORDER_WIDGET_FULL_LOAD
+ { WWT_DROPDOWN, RESIZE_TB, 14, 248, 371, 76, 87, STR_NULL, STR_ORDER_TOOLTIP_UNLOAD}, // ORDER_WIDGET_UNLOAD
+ { WWT_PUSHTXTBTN, RESIZE_TB, 14, 124, 247, 76, 87, STR_REFIT, STR_REFIT_TIP}, // ORDER_WIDGET_REFIT
+ { WWT_PUSHTXTBTN, RESIZE_TB, 14, 248, 371, 76, 87, STR_SERVICE, STR_SERVICE_HINT}, // ORDER_WIDGET_SERVICE
- { WWT_RESIZEBOX, RESIZE_LRTB, 14, 387, 398, 76, 87, 0x0, STR_RESIZE_BUTTON}, // ORDER_WIDGET_RESIZE
+ { WWT_DROPDOWN, RESIZE_TB, 14, 0, 123, 76, 87, STR_NULL, STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP}, // ORDER_WIDGET_COND_VARIABLE
+ { WWT_DROPDOWN, RESIZE_TB, 14, 124, 247, 76, 87, STR_NULL, STR_ORDER_CONDITIONAL_COMPARATOR_TOOLTIP}, // ORDER_WIDGET_COND_COMPARATOR
+ { WWT_PUSHTXTBTN, RESIZE_TB, 14, 248, 371, 76, 87, STR_CONDITIONAL_VALUE, STR_ORDER_CONDITIONAL_VALUE_TOOLTIP}, // ORDER_WIDGET_COND_VALUE
+
+ { WWT_PANEL, RESIZE_RTB, 14, 372, 373, 76, 99, 0x0, STR_NULL}, // ORDER_WIDGET_RESIZE_BAR
+ { WWT_PUSHIMGBTN, RESIZE_LRTB, 14, 372, 385, 76, 87, SPR_SHARED_ORDERS_ICON, STR_VEH_WITH_SHARED_ORDERS_LIST_TIP}, // ORDER_WIDGET_SHARED_ORDER_LIST
+
+ { WWT_RESIZEBOX, RESIZE_LRTB, 14, 374, 385, 88, 99, 0x0, STR_RESIZE_BUTTON}, // ORDER_WIDGET_RESIZE
{ WIDGETS_END},
};
static const WindowDesc _orders_train_desc = {
- WDP_AUTO, WDP_AUTO, 399, 88, 399, 88,
+ WDP_AUTO, WDP_AUTO, 386, 100, 386, 100,
WC_VEHICLE_ORDERS,WC_VEHICLE_VIEW,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_RESIZABLE,
_orders_train_widgets,
@@ -769,32 +1079,36 @@
*/
static const Widget _orders_widgets[] = {
{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, // ORDER_WIDGET_CLOSEBOX
- { WWT_CAPTION, RESIZE_RIGHT, 14, 11, 409, 0, 13, STR_8829_ORDERS, STR_018C_WINDOW_TITLE_DRAG_THIS}, // ORDER_WIDGET_CAPTION
- { WWT_PUSHTXTBTN, RESIZE_LR, 14, 349, 409, 0, 13, STR_TIMETABLE_VIEW, STR_TIMETABLE_VIEW_TOOLTIP}, // ORDER_WIDGET_TIMETABLE_VIEW
+ { WWT_CAPTION, RESIZE_RIGHT, 14, 11, 385, 0, 13, STR_8829_ORDERS, STR_018C_WINDOW_TITLE_DRAG_THIS}, // ORDER_WIDGET_CAPTION
+ { WWT_PUSHTXTBTN, RESIZE_LR, 14, 325, 385, 0, 13, STR_TIMETABLE_VIEW, STR_TIMETABLE_VIEW_TOOLTIP}, // ORDER_WIDGET_TIMETABLE_VIEW
- { WWT_PANEL, RESIZE_RB, 14, 0, 397, 14, 75, 0x0, STR_8852_ORDERS_LIST_CLICK_ON_ORDER}, // ORDER_WIDGET_ORDER_LIST
+ { WWT_PANEL, RESIZE_RB, 14, 0, 373, 14, 75, 0x0, STR_8852_ORDERS_LIST_CLICK_ON_ORDER}, // ORDER_WIDGET_ORDER_LIST
- { WWT_SCROLLBAR, RESIZE_LRB, 14, 398, 409, 14, 75, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST}, // ORDER_WIDGET_SCROLLBAR
+ { WWT_SCROLLBAR, RESIZE_LRB, 14, 374, 385, 14, 75, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST}, // ORDER_WIDGET_SCROLLBAR
- { WWT_PUSHTXTBTN, RESIZE_TB, 14, 0, 63, 76, 87, STR_8823_SKIP, STR_8853_SKIP_THE_CURRENT_ORDER}, // ORDER_WIDGET_SKIP
- { WWT_PUSHTXTBTN, RESIZE_TB, 14, 64, 128, 76, 87, STR_8824_DELETE, STR_8854_DELETE_THE_HIGHLIGHTED}, // ORDER_WIDGET_DELETE
+ { WWT_PUSHTXTBTN, RESIZE_TB, 14, 0, 123, 88, 99, STR_8823_SKIP, STR_8853_SKIP_THE_CURRENT_ORDER}, // ORDER_WIDGET_SKIP
+ { WWT_PUSHTXTBTN, RESIZE_TB, 14, 124, 247, 88, 99, STR_8824_DELETE, STR_8854_DELETE_THE_HIGHLIGHTED}, // ORDER_WIDGET_DELETE
{ WWT_EMPTY, RESIZE_TB, 14, 0, 0, 76, 87, 0x0, 0x0}, // ORDER_WIDGET_NON_STOP
- { WWT_TEXTBTN, RESIZE_TB, 14, 129, 192, 76, 87, STR_8826_GO_TO, STR_8856_INSERT_A_NEW_ORDER_BEFORE}, // ORDER_WIDGET_GOTO
- { WWT_PUSHTXTBTN, RESIZE_TB, 14, 193, 256, 76, 87, STR_FULLLOAD_OR_SERVICE, STR_NULL}, // ORDER_WIDGET_FULL_LOAD
- { WWT_PUSHTXTBTN, RESIZE_TB, 14, 257, 319, 76, 87, STR_8828_UNLOAD, STR_8858_MAKE_THE_HIGHLIGHTED_ORDER}, // ORDER_WIDGET_UNLOAD
- { WWT_PUSHTXTBTN, RESIZE_TB, 14, 257, 319, 76, 87, STR_REFIT, STR_REFIT_TIP}, // ORDER_WIDGET_REFIT
- { WWT_PUSHTXTBTN, RESIZE_TB, 14, 320, 383, 76, 87, STR_TRANSFER, STR_MAKE_THE_HIGHLIGHTED_ORDER}, // ORDER_WIDGET_TRANSFER
+ { WWT_TEXTBTN, RESIZE_TB, 14, 248, 359, 88, 99, STR_8826_GO_TO, STR_8856_INSERT_A_NEW_ORDER_BEFORE}, // ORDER_WIDGET_GOTO
+ { WWT_DROPDOWN, RESIZE_TB, 14, 360, 371, 88, 99, STR_EMPTY, STR_ORDER_GO_TO_DROPDOWN_TOOLTIP}, // ORDER_WIDGET_GOTO_DROPDOWN
+ { WWT_DROPDOWN, RESIZE_TB, 14, 0, 185, 76, 87, STR_NULL, STR_ORDER_TOOLTIP_FULL_LOAD}, // ORDER_WIDGET_FULL_LOAD
+ { WWT_DROPDOWN, RESIZE_TB, 14, 186, 371, 76, 87, STR_NULL, STR_ORDER_TOOLTIP_UNLOAD}, // ORDER_WIDGET_UNLOAD
+ { WWT_PUSHTXTBTN, RESIZE_TB, 14, 0, 185, 76, 87, STR_REFIT, STR_REFIT_TIP}, // ORDER_WIDGET_REFIT
+ { WWT_PUSHTXTBTN, RESIZE_TB, 14, 186, 371, 76, 87, STR_SERVICE, STR_SERVICE_HINT}, // ORDER_WIDGET_SERVICE
- { WWT_PUSHIMGBTN, RESIZE_TB, 14, 384, 397, 76, 87, SPR_SHARED_ORDERS_ICON, STR_VEH_WITH_SHARED_ORDERS_LIST_TIP}, // ORDER_WIDGET_SHARED_ORDER_LIST
+ { WWT_DROPDOWN, RESIZE_TB, 14, 0, 123, 76, 87, STR_NULL, STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP}, // ORDER_WIDGET_COND_VARIABLE
+ { WWT_DROPDOWN, RESIZE_TB, 14, 124, 247, 76, 87, STR_NULL, STR_ORDER_CONDITIONAL_COMPARATOR_TOOLTIP}, // ORDER_WIDGET_COND_COMPARATOR
+ { WWT_PUSHTXTBTN, RESIZE_TB, 14, 248, 371, 76, 87, STR_CONDITIONAL_VALUE, STR_ORDER_CONDITIONAL_VALUE_TOOLTIP}, // ORDER_WIDGET_COND_VALUE
- { WWT_PANEL, RESIZE_RTB, 14, 397, 396, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_RESIZE_BAR
+ { WWT_PANEL, RESIZE_RTB, 14, 372, 373, 76, 99, 0x0, STR_NULL}, // ORDER_WIDGET_RESIZE_BAR
+ { WWT_PUSHIMGBTN, RESIZE_LRTB, 14, 372, 385, 76, 87, SPR_SHARED_ORDERS_ICON, STR_VEH_WITH_SHARED_ORDERS_LIST_TIP}, // ORDER_WIDGET_SHARED_ORDER_LIST
- { WWT_RESIZEBOX, RESIZE_LRTB, 14, 398, 409, 76, 87, 0x0, STR_RESIZE_BUTTON}, // ORDER_WIDGET_RESIZE
+ { WWT_RESIZEBOX, RESIZE_LRTB, 14, 374, 385, 88, 99, 0x0, STR_RESIZE_BUTTON}, // ORDER_WIDGET_RESIZE
{ WIDGETS_END},
};
static const WindowDesc _orders_desc = {
- WDP_AUTO, WDP_AUTO, 410, 88, 410, 88,
+ WDP_AUTO, WDP_AUTO, 386, 100, 386, 100,
WC_VEHICLE_ORDERS,WC_VEHICLE_VIEW,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_RESIZABLE,
_orders_widgets,
@@ -806,32 +1120,36 @@
*/
static const Widget _other_orders_widgets[] = {
{ WWT_CLOSEBOX, RESIZE_NONE, 14, 0, 10, 0, 13, STR_00C5, STR_018B_CLOSE_WINDOW}, // ORDER_WIDGET_CLOSEBOX
- { WWT_CAPTION, RESIZE_RIGHT, 14, 11, 331, 0, 13, STR_A00B_ORDERS, STR_018C_WINDOW_TITLE_DRAG_THIS}, // ORDER_WIDGET_CAPTION
- { WWT_PUSHTXTBTN, RESIZE_LR, 14, 271, 331, 0, 13, STR_TIMETABLE_VIEW, STR_TIMETABLE_VIEW_TOOLTIP}, // ORDER_WIDGET_TIMETABLE_VIEW
-
- { WWT_PANEL, RESIZE_RB, 14, 0, 319, 14, 75, 0x0, STR_8852_ORDERS_LIST_CLICK_ON_ORDER}, // ORDER_WIDGET_ORDER_LIST
-
- { WWT_SCROLLBAR, RESIZE_LRB, 14, 320, 331, 14, 75, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST}, // ORDER_WIDGET_SCROLLBAR
+ { WWT_CAPTION, RESIZE_RIGHT, 14, 11, 385, 0, 13, STR_8829_ORDERS, STR_018C_WINDOW_TITLE_DRAG_THIS}, // ORDER_WIDGET_CAPTION
+ { WWT_PUSHTXTBTN, RESIZE_LR, 14, 325, 385, 0, 13, STR_TIMETABLE_VIEW, STR_TIMETABLE_VIEW_TOOLTIP}, // ORDER_WIDGET_TIMETABLE_VIEW
- { WWT_EMPTY, RESIZE_NONE, 14, 0, 319, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_SKIP
- { WWT_EMPTY, RESIZE_NONE, 14, 0, 319, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_DELETE
- { WWT_EMPTY, RESIZE_NONE, 14, 0, 319, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_NON_STOP
- { WWT_EMPTY, RESIZE_NONE, 14, 0, 319, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_GOTO
- { WWT_EMPTY, RESIZE_NONE, 14, 0, 319, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_FULL_LOAD
- { WWT_EMPTY, RESIZE_NONE, 14, 0, 319, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_UNLOAD
- { WWT_EMPTY, RESIZE_NONE, 14, 0, 319, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_REFIT
- { WWT_EMPTY, RESIZE_NONE, 14, 0, 319, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_TRANSFER
+ { WWT_PANEL, RESIZE_RB, 14, 0, 373, 14, 75, 0x0, STR_8852_ORDERS_LIST_CLICK_ON_ORDER}, // ORDER_WIDGET_ORDER_LIST
- { WWT_EMPTY, RESIZE_NONE, 14, 0, 319, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_SHARED_ORDER_LIST
+ { WWT_SCROLLBAR, RESIZE_LRB, 14, 374, 385, 14, 75, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST}, // ORDER_WIDGET_SCROLLBAR
- { WWT_PANEL, RESIZE_RTB, 14, 0, 319, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_RESIZE_BAR
+ { WWT_EMPTY, RESIZE_NONE, 14, 0, 0, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_SKIP
+ { WWT_EMPTY, RESIZE_NONE, 14, 0, 0, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_DELETE
+ { WWT_EMPTY, RESIZE_NONE, 14, 0, 0, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_NON_STOP
+ { WWT_EMPTY, RESIZE_NONE, 14, 0, 0, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_GOTO
+ { WWT_EMPTY, RESIZE_NONE, 14, 0, 0, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_GOTO_DROPDOWN
+ { WWT_EMPTY, RESIZE_NONE, 14, 0, 0, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_FULL_LOAD
+ { WWT_EMPTY, RESIZE_NONE, 14, 0, 0, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_UNLOAD
+ { WWT_EMPTY, RESIZE_NONE, 14, 0, 0, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_REFIT
+ { WWT_EMPTY, RESIZE_NONE, 14, 0, 0, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_SERVICE
- { WWT_RESIZEBOX, RESIZE_LRTB, 14, 320, 331, 76, 87, 0x0, STR_RESIZE_BUTTON}, // ORDER_WIDGET_RESIZE
+ { WWT_EMPTY, RESIZE_NONE, 14, 0, 0, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_COND_VARIABLE
+ { WWT_EMPTY, RESIZE_NONE, 14, 0, 0, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_COND_COMPARATOR
+ { WWT_EMPTY, RESIZE_NONE, 14, 0, 0, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_COND_VALUE
+
+ { WWT_PANEL, RESIZE_RTB, 14, 0, 373, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_RESIZE_BAR
+ { WWT_EMPTY, RESIZE_TB, 14, 0, 0, 76, 87, 0x0, STR_NULL}, // ORDER_WIDGET_SHARED_ORDER_LIST
+
+ { WWT_RESIZEBOX, RESIZE_LRTB, 14, 374, 385, 76, 87, 0x0, STR_RESIZE_BUTTON}, // ORDER_WIDGET_RESIZE
{ WIDGETS_END},
};
static const WindowDesc _other_orders_desc = {
- WDP_AUTO, WDP_AUTO, 332, 88, 332, 88,
+ WDP_AUTO, WDP_AUTO, 386, 88, 386, 88,
WC_VEHICLE_ORDERS,WC_VEHICLE_VIEW,
WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_RESIZABLE,
_other_orders_widgets,