(svn r7759) -Merge: makefile rewrite. This merge features:

 - A proper ./configure, so everything needs to be configured only once, not for every make.
 - Usage of makedepend when available. This greatly reduces the time needed for generating the dependencies.
 - A generator for all project files. There is a single file with sources, which is used to generate Makefiles and the project files for MSVC.
 - Proper support for OSX universal binaries.
 - Object files for non-MSVC compiles are also placed in separate directories, making is faster to switch between debug and release compiles and it does not touch the directory with the source files.
 - Functionality to make a bundle of all needed files for for example a nightly or distribution of a binary with all needed GRFs and language files.

Note: as this merge moves almost all files, it is recommended to make a backup of your working copy before updating your working copy.

1 files changed, 0 insertions, 664 deletions

diff --git a/order_gui.c b/order_gui.c
deleted file mode 100644
index adcaadba0..000000000
--- a/order_gui.c
+++ /dev/null
@@ -1,664 +0,0 @@
-/* $Id$ */
-
-#include "stdafx.h"
-#include "openttd.h"
-#include "road_map.h"
-#include "station_map.h"
-#include "table/sprites.h"
-#include "table/strings.h"
-#include "functions.h"
-#include "map.h"
-#include "tile.h"
-#include "window.h"
-#include "gui.h"
-#include "gfx.h"
-#include "vehicle.h"
-#include "station.h"
-#include "town.h"
-#include "command.h"
-#include "viewport.h"
-#include "depot.h"
-#include "waypoint.h"
-#include "train.h"
-#include "water_map.h"
-#include "vehicle_gui.h"
-
-static int OrderGetSel(const Window *w)
-{
-	const Vehicle *v = GetVehicle(w->window_number);
-	int num = WP(w,order_d).sel;
-
-	return (num >= 0 && num < v->num_orders) ? num : v->num_orders;
-}
-
-static StringID StationOrderStrings[] = {
-	STR_8806_GO_TO,
-	STR_8807_GO_TO_TRANSFER,
-	STR_8808_GO_TO_UNLOAD,
-	STR_8809_GO_TO_TRANSFER_UNLOAD,
-	STR_880A_GO_TO_LOAD,
-	STR_880B_GO_TO_TRANSFER_LOAD,
-	STR_NULL,
-	STR_NULL,
-	STR_880C_GO_NON_STOP_TO,
-	STR_880D_GO_TO_NON_STOP_TRANSFER,
-	STR_880E_GO_NON_STOP_TO_UNLOAD,
-	STR_880F_GO_TO_NON_STOP_TRANSFER_UNLOAD,
-	STR_8810_GO_NON_STOP_TO_LOAD,
-	STR_8811_GO_TO_NON_STOP_TRANSFER_LOAD,
-	STR_NULL
-};
-
-static void DrawOrdersWindow(Window *w)
-{
-	const Vehicle *v;
-	const Order *order;
-	StringID str;
-	int sel;
-	int y, i;
-	bool shared_orders;
-	byte color;
-
-	v = GetVehicle(w->window_number);
-
-	shared_orders = IsOrderListShared(v);
-
-	SetVScrollCount(w, v->num_orders + 1);
-
-	sel = OrderGetSel(w);
-	SetDParam(2, STR_8827_FULL_LOAD);
-
-	order = GetVehicleOrder(v, sel);
-
-	if (v->owner == _local_player) {
-		/* skip */
-		SetWindowWidgetDisabledState(w,  4, v->num_orders == 0);
-
-		/* delete */
-		SetWindowWidgetDisabledState(w,  5,
-				(uint)v->num_orders + (shared_orders ? 1 : 0) <= (uint)WP(w, order_d).sel);
-
-		/* non-stop only for trains */
-		SetWindowWidgetDisabledState(w,  6, v->type != VEH_Train || order == NULL);
-		SetWindowWidgetDisabledState(w,  8, order == NULL); // full load
-		SetWindowWidgetDisabledState(w,  9, order == NULL); // unload
-		SetWindowWidgetDisabledState(w, 10, order == NULL); // transfer
-		/* Disable list of vehicles with the same shared orders if there is no list */
-		SetWindowWidgetDisabledState(w, 11, !shared_orders || v->orders == NULL);
-		SetWindowWidgetDisabledState(w, 12, order == NULL); // Refit
-		HideWindowWidget(w, 12); // Refit
-	} else {
-		DisableWindowWidget(w, 10);
-	}
-
-	ShowWindowWidget(w, 9); // Unload
-
-	if (order != NULL) {
-		switch (order->type) {
-			case OT_GOTO_STATION: break;
-
-			case OT_GOTO_DEPOT:
-				DisableWindowWidget(w, 10);
-
-				/* Remove unload and replace it with refit */
-				HideWindowWidget(w,  9);
-				ShowWindowWidget(w, 12);
-				SetDParam(2,STR_SERVICE);
-				break;
-
-			case OT_GOTO_WAYPOINT:
-				DisableWindowWidget(w,  8);
-				DisableWindowWidget(w,  9);
-				DisableWindowWidget(w, 10);
-				break;
-
-			default: // every other orders
-				DisableWindowWidget(w, 6);
-				DisableWindowWidget(w, 8);
-				DisableWindowWidget(w, 9);
-		}
-	}
-
-	SetDParam(0, v->string_id);
-	SetDParam(1, v->unitnumber);
-	DrawWindowWidgets(w);
-
-	y = 15;
-
-	i = w->vscroll.pos;
-	order = GetVehicleOrder(v, i);
-	while (order != NULL) {
-		str = (v->cur_order_index == i) ? STR_8805 : STR_8804;
-		SetDParam(3, STR_EMPTY);
-
-		if (i - w->vscroll.pos < w->vscroll.cap) {
-			SetDParam(1, 6);
-
-			switch (order->type) {
-				case OT_GOTO_STATION:
-					SetDParam(1, StationOrderStrings[order->flags]);
-					SetDParam(2, order->dest);
-					break;
-
-				case OT_GOTO_DEPOT: {
-					StringID s = STR_NULL;
-
-					if (v->type == VEH_Aircraft) {
-						s = STR_GO_TO_AIRPORT_HANGAR;
-						SetDParam(2, order->dest);
-					} else {
-						SetDParam(2, GetDepot(order->dest)->town_index);
-
-						switch (v->type) {
-							case VEH_Train: s = (order->flags & OF_NON_STOP) ? STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT : STR_GO_TO_TRAIN_DEPOT; break;
-							case VEH_Road:  s = STR_9038_GO_TO_ROADVEH_DEPOT; break;
-							case VEH_Ship:  s = STR_GO_TO_SHIP_DEPOT; break;
-							default: break;
-						}
-					}
-
-					if (order->flags & OF_FULL_LOAD) s++; /* service at */
-
-					SetDParam(1, s);
-					if (order->refit_cargo < NUM_CARGO) {
-						SetDParam(3, STR_REFIT_ORDER);
-						SetDParam(4, _cargoc.names_s[order->refit_cargo]);
-					} else {
-						SetDParam(3, STR_EMPTY);
-					}
-					break;
-				}
-
-				case OT_GOTO_WAYPOINT:
-					SetDParam(1, (order->flags & OF_NON_STOP) ? STR_GO_NON_STOP_TO_WAYPOINT : STR_GO_TO_WAYPOINT);
-					SetDParam(2, order->dest);
-					break;
-
-				default: break;
-			}
-
-			color = (i == WP(w,order_d).sel) ? 0xC : 0x10;
-			SetDParam(0, i + 1);
-			if (order->type != OT_DUMMY) {
-				DrawString(2, y, str, color);
-			} else {
-				SetDParam(1, STR_INVALID_ORDER);
-				SetDParam(2, order->dest);
-				DrawString(2, y, str, color);
-			}
-			y += 10;
-		}
-
-		i++;
-		order = order->next;
-	}
-
-	if (i - w->vscroll.pos < w->vscroll.cap) {
-		str = shared_orders ? STR_END_OF_SHARED_ORDERS : STR_882A_END_OF_ORDERS;
-		color = (i == WP(w,order_d).sel) ? 0xC : 0x10;
-		DrawString(2, y, str, color);
-	}
-}
-
-static Order GetOrderCmdFromTile(const Vehicle *v, TileIndex tile)
-{
-	Order order;
-	order.next  = NULL;
-	order.index = 0;
-	order.refit_cargo   = CT_INVALID;
-	order.refit_subtype = 0;
-
-	// 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.type = OT_GOTO_DEPOT;
-					order.flags = OF_PART_OF_ORDERS;
-					order.dest = GetDepotByTile(tile)->index;
-					return order;
-				}
-			}
-			break;
-
-		case MP_STREET:
-			if (GetRoadTileType(tile) == ROAD_TILE_DEPOT && v->type == VEH_Road && IsTileOwner(tile, _local_player)) {
-				order.type = OT_GOTO_DEPOT;
-				order.flags = OF_PART_OF_ORDERS;
-				order.dest = GetDepotByTile(tile)->index;
-				return order;
-			}
-			break;
-
-		case MP_STATION:
-			if (v->type != VEH_Aircraft) break;
-			if (IsHangar(tile) && IsTileOwner(tile, _local_player)) {
-				order.type = OT_GOTO_DEPOT;
-				order.flags = OF_PART_OF_ORDERS;
-				order.dest = GetStationIndex(tile);
-				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);
-
-				order.type = OT_GOTO_DEPOT;
-				order.flags = OF_PART_OF_ORDERS;
-				order.dest = GetDepotByTile(tile < tile2 ? tile : tile2)->index;
-				return order;
-			}
-
-			default:
-				break;
-		}
-	}
-
-	// check waypoint
-	if (IsTileType(tile, MP_RAILWAY) &&
-			v->type == VEH_Train &&
-			IsTileOwner(tile, _local_player) &&
-			IsRailWaypoint(tile)) {
-		order.type = OT_GOTO_WAYPOINT;
-		order.flags = 0;
-		order.dest = GetWaypointByTile(tile)->index;
-		return order;
-	}
-
-	if (IsTileType(tile, MP_STATION)) {
-		StationID st_index = GetStationIndex(tile);
-		const Station *st = GetStation(st_index);
-
-		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 && v->cargo_type == CT_PASSENGERS) ||
-			(facil=FACIL_TRUCK_STOP, 1);
-			if (st->facilities & facil) {
-				order.type = OT_GOTO_STATION;
-				order.flags = 0;
-				order.dest = st_index;
-				return order;
-			}
-		}
-	}
-
-	// not found
-	order.type = OT_NOTHING;
-	order.flags = 0;
-	order.dest = INVALID_STATION;
-	return order;
-}
-
-static bool HandleOrderVehClick(const Vehicle *v, const Vehicle *u, Window *w)
-{
-	if (u->type != v->type) return false;
-
-	if (u->type == VEH_Train && !IsFrontEngine(u)) {
-		u = GetFirstVehicleInChain(u);
-		if (!IsFrontEngine(u)) 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
-	if (v->num_orders != 0 && _ctrl_pressed == 0) return false;
-
-	if (DoCommandP(v->tile, v->index | (u->index << 16), _ctrl_pressed ? 0 : 1, NULL,
-		_ctrl_pressed ? CMD_CLONE_ORDER | CMD_MSG(STR_CANT_SHARE_ORDER_LIST) : CMD_CLONE_ORDER | CMD_MSG(STR_CANT_COPY_ORDER_LIST))) {
-		WP(w,order_d).sel = -1;
-		ResetObjectToPlace();
-	}
-
-	return true;
-}
-
-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();
-	if (u != NULL && HandleOrderVehClick(v, u, w)) return;
-
-	cmd = GetOrderCmdFromTile(v, tile);
-	if (cmd.type == OT_NOTHING) return;
-
-	if (DoCommandP(v->tile, v->index + (OrderGetSel(w) << 16), PackOrder(&cmd), NULL, CMD_INSERT_ORDER | CMD_MSG(STR_8833_CAN_T_INSERT_NEW_ORDER))) {
-		if (WP(w,order_d).sel != -1) WP(w,order_d).sel++;
-		ResetObjectToPlace();
-	}
-}
-
-static void OrderClick_Goto(Window *w, const Vehicle *v)
-{
-	InvalidateWidget(w, 7);
-	ToggleWidgetLoweredState(w, 7);
-	if (IsWindowWidgetLowered(w, 7)) {
-		_place_clicked_vehicle = NULL;
-		SetObjectToPlaceWnd(ANIMCURSOR_PICKSTATION, 1, w);
-	} else {
-		ResetObjectToPlace();
-	}
-}
-
-static void OrderClick_FullLoad(Window *w, const Vehicle *v)
-{
-	DoCommandP(v->tile, v->index + (OrderGetSel(w) << 16), OFB_FULL_LOAD, NULL, CMD_MODIFY_ORDER | CMD_MSG(STR_8835_CAN_T_MODIFY_THIS_ORDER));
-}
-
-static void OrderClick_Unload(Window *w, const Vehicle *v)
-{
-	DoCommandP(v->tile, v->index + (OrderGetSel(w) << 16), OFB_UNLOAD,    NULL, CMD_MODIFY_ORDER | CMD_MSG(STR_8835_CAN_T_MODIFY_THIS_ORDER));
-}
-
-static void OrderClick_Nonstop(Window *w, const Vehicle *v)
-{
-	DoCommandP(v->tile, v->index + (OrderGetSel(w) << 16), OFB_NON_STOP,  NULL, CMD_MODIFY_ORDER | CMD_MSG(STR_8835_CAN_T_MODIFY_THIS_ORDER));
-}
-
-static void OrderClick_Transfer(Window* w, const Vehicle* v)
-{
-	DoCommandP(v->tile, v->index + (OrderGetSel(w) <<  16), OFB_TRANSFER, NULL, CMD_MODIFY_ORDER | CMD_MSG(STR_8835_CAN_T_MODIFY_THIS_ORDER));
-}
-
-static void OrderClick_Skip(Window *w, const Vehicle *v)
-{
-	DoCommandP(v->tile, v->index, 0, NULL, CMD_SKIP_ORDER);
-}
-
-static void OrderClick_Delete(Window *w, const Vehicle *v)
-{
-	DoCommandP(v->tile, v->index, OrderGetSel(w), NULL, CMD_DELETE_ORDER | CMD_MSG(STR_8834_CAN_T_DELETE_THIS_ORDER));
-}
-
-static void OrderClick_Refit(Window *w, const Vehicle *v)
-{
-	if (_ctrl_pressed) {
-		/* Cancel refitting */
-		DoCommandP(v->tile, v->index, (WP(w,order_d).sel << 16) | (CT_NO_REFIT << 8) | CT_NO_REFIT, NULL, CMD_ORDER_REFIT);
-	} else {
-		ShowVehicleRefitWindow(v, WP(w,order_d).sel);
-	}
-}
-
-typedef void OnButtonVehClick(Window *w, const Vehicle *v);
-
-static OnButtonVehClick* const _order_button_proc[] = {
-	OrderClick_Skip,
-	OrderClick_Delete,
-	OrderClick_Nonstop,
-	OrderClick_Goto,
-	OrderClick_FullLoad,
-	OrderClick_Unload,
-	OrderClick_Transfer
-};
-
-static const uint16 _order_keycodes[] = {
-	'D', //skip order
-	'F', //delete order
-	'G', //non-stop
-	'H', //goto order
-	'J', //full load
-	'K'  //unload
-};
-
-static void OrdersWndProc(Window *w, WindowEvent *e)
-{
-	switch (e->event) {
-		case WE_CREATE:
-			/* Move Refit to the same location as Unload
-			 * This will ensure that they always stay at the same location even if Unload is moved in a later commit */
-			w->widget[12].left   = w->widget[9].left;
-			w->widget[12].right  = w->widget[9].right;
-			w->widget[12].top    = w->widget[9].top;
-			w->widget[12].bottom = w->widget[9].bottom;
-			break;
-
-	case WE_PAINT:
-		DrawOrdersWindow(w);
-		break;
-
-	case WE_CLICK: {
-		Vehicle *v = GetVehicle(w->window_number);
-		switch (e->we.click.widget) {
-		case 2: { /* orders list */
-			int sel = (e->we.click.pt.y - 15) / 10;
-
-			if ((uint)sel >= w->vscroll.cap) return;
-
-			sel += w->vscroll.pos;
-
-			if (_ctrl_pressed && sel < v->num_orders) {
-				const Order *ord = GetVehicleOrder(v, sel);
-				TileIndex xy;
-
-				switch (ord->type) {
-					case OT_GOTO_STATION:  xy = GetStation(ord->dest)->xy ; break;
-					case OT_GOTO_DEPOT:    xy = GetDepot(ord->dest)->xy;    break;
-					case OT_GOTO_WAYPOINT: xy = GetWaypoint(ord->dest)->xy; break;
-					default:               xy = 0; break;
-				}
-
-				if (xy != 0) ScrollMainWindowToTile(xy);
-				return;
-			}
-
-			if (sel == WP(w,order_d).sel) sel = -1;
-			WP(w,order_d).sel = sel;
-			SetWindowDirty(w);
-		}	break;
-
-		case 4: /* skip button */
-			OrderClick_Skip(w, v);
-			break;
-
-		case 5: /* delete button */
-			OrderClick_Delete(w, v);
-			break;
-
-		case 6: /* non stop button */
-			OrderClick_Nonstop(w, v);
-			break;
-
-		case 7: /* goto button */
-			OrderClick_Goto(w, v);
-			break;
-
-		case 8: /* full load button */
-			OrderClick_FullLoad(w, v);
-			break;
-
-		case 9: /* unload button */
-			OrderClick_Unload(w, v);
-			break;
-		case 10: /* transfer button */
-			OrderClick_Transfer(w, v);
-			break;
-		case 11: /* Vehicle with same shared Orders button */
-			ShowVehWithSharedOrders(v, v->type);
-			break;
-		case 12:
-			OrderClick_Refit(w, v);
-			break;
-		}
-	} 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 (!IsWindowWidgetDisabled(w, i + 4)) _order_button_proc[i](w, v);
-				break;
-			}
-		}
-		break;
-	}
-
-	case WE_RCLICK: {
-		const Vehicle *v = GetVehicle(w->window_number);
-		int s = OrderGetSel(w);
-
-		if (e->we.click.widget != 8) break;
-		if (s == v->num_orders || GetVehicleOrder(v, s)->type != 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: {
-		RaiseWindowWidget(w, 7);
-		InvalidateWidget(w, 7);
-	} 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 && IsWindowWidgetLowered(w, 7)) {
-			_place_clicked_vehicle = NULL;
-			HandleOrderVehClick(GetVehicle(w->window_number), v, w);
-		}
-	} break;
-
-	case WE_RESIZE:
-		/* Update the scroll + matrix */
-		w->vscroll.cap = (w->widget[2].bottom - w->widget[2].top) / 10;
-		break;
-
-	case WE_TIMEOUT: { // handle button unclick ourselves...
-		// unclick all buttons except for the 'goto' button (7), which is 'persistent'
-		uint i;
-		for (i = 0; i < w->widget_count; i++) {
-			if (IsWindowWidgetLowered(w, i) && i != 7) {
-				RaiseWindowWidget(w, i);
-				InvalidateWidget(w, i);
-			}
-		}
-	} break;
-	}
-}
-
-static const Widget _orders_train_widgets[] = {
-{   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,                STR_018B_CLOSE_WINDOW},
-{    WWT_CAPTION,   RESIZE_RIGHT,   14,    11,   398,     0,    13, STR_8829_ORDERS,         STR_018C_WINDOW_TITLE_DRAG_THIS},
-{      WWT_PANEL,   RESIZE_RB,      14,     0,   386,    14,    75, 0x0,                     STR_8852_ORDERS_LIST_CLICK_ON_ORDER},
-{  WWT_SCROLLBAR,   RESIZE_LRB,     14,   387,   398,    14,    75, 0x0,                     STR_0190_SCROLL_BAR_SCROLLS_LIST},
-{ WWT_PUSHTXTBTN,   RESIZE_TB,      14,     0,    52,    76,    87, STR_8823_SKIP,           STR_8853_SKIP_THE_CURRENT_ORDER},
-{ WWT_PUSHTXTBTN,   RESIZE_TB,      14,    53,   105,    76,    87, STR_8824_DELETE,         STR_8854_DELETE_THE_HIGHLIGHTED},
-{ WWT_PUSHTXTBTN,   RESIZE_TB,      14,   106,   158,    76,    87, STR_8825_NON_STOP,       STR_8855_MAKE_THE_HIGHLIGHTED_ORDER},
-{    WWT_TEXTBTN,   RESIZE_TB,      14,   159,   211,    76,    87, STR_8826_GO_TO,          STR_8856_INSERT_A_NEW_ORDER_BEFORE},
-{ WWT_PUSHTXTBTN,   RESIZE_TB,      14,   212,   264,    76,    87, STR_FULLLOAD_OR_SERVICE, STR_NULL},
-{ WWT_PUSHTXTBTN,   RESIZE_TB,      14,   265,   319,    76,    87, STR_8828_UNLOAD,         STR_8858_MAKE_THE_HIGHLIGHTED_ORDER},
-{ WWT_PUSHTXTBTN,   RESIZE_TB,      14,   320,   372,    76,    87, STR_886F_TRANSFER,       STR_886D_MAKE_THE_HIGHLIGHTED_ORDER},
-{ WWT_PUSHIMGBTN,   RESIZE_TB,      14,   373,   386,    76,    87, SPR_SHARED_ORDERS_ICON,  STR_VEH_WITH_SHARED_ORDERS_LIST_TIP},
-{ WWT_PUSHTXTBTN,   RESIZE_TB,      14,   320,   372,    76,    87, STR_REFIT,               STR_REFIT_TIP},
-{      WWT_PANEL,   RESIZE_RTB,     14,   387,   386,    76,    87, 0x0,                     STR_NULL},
-{  WWT_RESIZEBOX,   RESIZE_LRTB,    14,   387,   398,    76,    87, 0x0,                     STR_RESIZE_BUTTON},
-{   WIDGETS_END},
-};
-
-static const WindowDesc _orders_train_desc = {
-	WDP_AUTO, WDP_AUTO, 399, 88,
-	WC_VEHICLE_ORDERS,WC_VEHICLE_VIEW,
-	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_RESIZABLE,
-	_orders_train_widgets,
-	OrdersWndProc
-};
-
-static const Widget _orders_widgets[] = {
-{   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,                STR_018B_CLOSE_WINDOW},
-{    WWT_CAPTION,   RESIZE_RIGHT,   14,    11,   409,     0,    13, STR_8829_ORDERS,         STR_018C_WINDOW_TITLE_DRAG_THIS},
-{      WWT_PANEL,   RESIZE_RB,      14,     0,   397,    14,    75, 0x0,                     STR_8852_ORDERS_LIST_CLICK_ON_ORDER},
-{  WWT_SCROLLBAR,   RESIZE_LRB,     14,   398,   409,    14,    75, 0x0,                     STR_0190_SCROLL_BAR_SCROLLS_LIST},
-{ WWT_PUSHTXTBTN,   RESIZE_TB,      14,     0,    63,    76,    87, STR_8823_SKIP,           STR_8853_SKIP_THE_CURRENT_ORDER},
-{ WWT_PUSHTXTBTN,   RESIZE_TB,      14,    64,   128,    76,    87, STR_8824_DELETE,         STR_8854_DELETE_THE_HIGHLIGHTED},
-{      WWT_EMPTY,   RESIZE_TB,      14,     0,     0,    76,    87, 0x0,                     0x0},
-{    WWT_TEXTBTN,   RESIZE_TB,      14,   129,   192,    76,    87, STR_8826_GO_TO,          STR_8856_INSERT_A_NEW_ORDER_BEFORE},
-{ WWT_PUSHTXTBTN,   RESIZE_TB,      14,   193,   256,    76,    87, STR_FULLLOAD_OR_SERVICE, STR_NULL},
-{ WWT_PUSHTXTBTN,   RESIZE_TB,      14,   257,   319,    76,    87, STR_8828_UNLOAD,         STR_8858_MAKE_THE_HIGHLIGHTED_ORDER},
-{ WWT_PUSHTXTBTN,   RESIZE_TB,      14,   320,   383,    76,    87, STR_886F_TRANSFER,       STR_886D_MAKE_THE_HIGHLIGHTED_ORDER},
-{ WWT_PUSHIMGBTN,   RESIZE_TB,      14,   384,   397,    76,    87, SPR_SHARED_ORDERS_ICON,  STR_VEH_WITH_SHARED_ORDERS_LIST_TIP},
-{ WWT_PUSHTXTBTN,   RESIZE_TB,      14,   320,   383,    76,    87, STR_REFIT,               STR_REFIT_TIP},
-{      WWT_PANEL,   RESIZE_RTB,     14,   397,   396,    76,    87, 0x0,                     STR_NULL},
-{  WWT_RESIZEBOX,   RESIZE_LRTB,    14,   398,   409,    76,    87, 0x0,                     STR_RESIZE_BUTTON},
-{   WIDGETS_END},
-};
-
-static const WindowDesc _orders_desc = {
-	WDP_AUTO, WDP_AUTO, 410, 88,
-	WC_VEHICLE_ORDERS,WC_VEHICLE_VIEW,
-	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_RESIZABLE,
-	_orders_widgets,
-	OrdersWndProc
-};
-
-static const Widget _other_orders_widgets[] = {
-{   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,        STR_018B_CLOSE_WINDOW},
-{    WWT_CAPTION,   RESIZE_RIGHT,   14,    11,   331,     0,    13, STR_A00B_ORDERS, STR_018C_WINDOW_TITLE_DRAG_THIS},
-{      WWT_PANEL,   RESIZE_RB,      14,     0,   319,    14,    75, 0x0,             STR_8852_ORDERS_LIST_CLICK_ON_ORDER},
-{  WWT_SCROLLBAR,   RESIZE_LRB,     14,   320,   331,    14,    75, 0x0,             STR_0190_SCROLL_BAR_SCROLLS_LIST},
-{      WWT_EMPTY,   RESIZE_NONE,    14,     0,   319,    76,    87, 0x0,             STR_NULL},
-{      WWT_EMPTY,   RESIZE_NONE,    14,     0,   319,    76,    87, 0x0,             STR_NULL},
-{      WWT_EMPTY,   RESIZE_NONE,    14,     0,   319,    76,    87, 0x0,             STR_NULL},
-{      WWT_EMPTY,   RESIZE_NONE,    14,     0,   319,    76,    87, 0x0,             STR_NULL},
-{      WWT_EMPTY,   RESIZE_NONE,    14,     0,   319,    76,    87, 0x0,             STR_NULL},
-{      WWT_EMPTY,   RESIZE_NONE,    14,     0,   319,    76,    87, 0x0,             STR_NULL},
-{      WWT_PANEL,   RESIZE_RTB,     14,     0,   319,    76,    87, 0x0,             STR_NULL},
-{  WWT_RESIZEBOX,   RESIZE_LRTB,    14,   320,   331,    76,    87, 0x0,             STR_RESIZE_BUTTON},
-{   WIDGETS_END},
-};
-
-static const WindowDesc _other_orders_desc = {
-	WDP_AUTO, WDP_AUTO, 332, 88,
-	WC_VEHICLE_ORDERS,WC_VEHICLE_VIEW,
-	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_RESIZABLE,
-	_other_orders_widgets,
-	OrdersWndProc
-};
-
-void ShowOrdersWindow(const Vehicle *v)
-{
-	Window *w;
-	VehicleID veh = v->index;
-
-	DeleteWindowById(WC_VEHICLE_ORDERS, veh);
-	DeleteWindowById(WC_VEHICLE_DETAILS, veh);
-
-	if (v->owner != _local_player) {
-		w = AllocateWindowDescFront(&_other_orders_desc, veh);
-	} else {
-		w = AllocateWindowDescFront((v->type == VEH_Train) ? &_orders_train_desc : &_orders_desc, veh);
-	}
-
-	if (w != NULL) {
-		w->caption_color = v->owner;
-		w->vscroll.cap = 6;
-		w->resize.step_height = 10;
-		WP(w,order_d).sel = -1;
-	}
-}