diff --git a/aircraft_gui.c b/aircraft_gui.c
new file mode 100644
--- /dev/null
+++ b/aircraft_gui.c
@@ -0,0 +1,1013 @@
+#include "stdafx.h"
+#include "ttd.h"
+#include "window.h"
+#include "gui.h"
+#include "vehicle.h"
+#include "gfx.h"
+#include "station.h"
+#include "command.h"
+#include "engine.h"
+#include "viewport.h"
+#include "player.h"
+
+extern const byte _aircraft_cost_table[NUM_AIRCRAFT_ENGINES];
+extern const byte _aircraft_speed[NUM_AIRCRAFT_ENGINES];
+extern const uint16 _aircraft_num_pass[NUM_AIRCRAFT_ENGINES];
+extern const byte _aircraft_num_mail[NUM_AIRCRAFT_ENGINES];
+extern const byte _aircraft_running_cost[NUM_AIRCRAFT_ENGINES];
+
+
+static void DrawAircraftImage(Vehicle *v, int x, int y, VehicleID selection)
+{
+	int image = GetAircraftImage(v, 6);
+	uint32 ormod = SPRITE_PALETTE(PLAYER_SPRITE_COLOR(v->owner));
+	if (v->vehstatus & VS_CRASHED) ormod = 0x3248000;
+	DrawSprite(image | ormod, x+25, y+10);
+	if (v->subtype == 0)
+		DrawSprite(0xF3D, x+25, y+5);
+	if (v->index == selection) {
+		DrawFrameRect(x-1, y-1, x+58, y+21, 0xF, 0x10);
+	}
+}
+
+static void CcBuildAircraft(bool success, uint tile, uint32 p1, uint32 p2)
+{
+	Vehicle *v;
+
+	if (success) {
+		v = &_vehicles[_new_aircraft_id];
+		if (v->tile == _backup_orders_tile) {
+			_backup_orders_tile = 0;
+			RestoreVehicleOrders(v, _backup_orders_data);
+		}
+		ShowAircraftViewWindow(v);
+	}
+}
+
+
+static void NewAircraftWndProc(Window *w, WindowEvent *e)
+{
+	YearMonthDay ymd;
+
+	switch(e->event) {
+
+	case WE_PAINT: {
+		if (w->window_number == 0)
+			SETBIT(w->disabled_state, 5);
+
+		{
+			int count = 0;
+			int num = NUM_AIRCRAFT_ENGINES;
+			Engine *e = &_engines[AIRCRAFT_ENGINES_INDEX];
+			do {
+				if (HASBIT(e->player_avail, _local_player))
+					count++;
+			} while (++e,--num);
+			SetVScrollCount(w, count);
+		}
+
+		DrawWindowWidgets(w);
+
+		{
+			int num = NUM_AIRCRAFT_ENGINES;
+			Engine *e = &_engines[AIRCRAFT_ENGINES_INDEX];
+			int x = 2;
+			int y = 15;
+			int sel = WP(w,buildtrain_d).sel_index;
+			int pos = w->vscroll.pos;
+			int engine_id = AIRCRAFT_ENGINES_INDEX;
+			int selected_id = -1;
+
+			do {
+				if (HASBIT(e->player_avail, _local_player)) {
+					if (sel==0) selected_id = engine_id;
+					if (IS_INT_INSIDE(--pos, -4, 0)) {
+						DrawString(x+62, y+7, GetCustomEngineName(engine_id), sel==0 ? 0xC : 0x10);
+						DrawAircraftEngine(x+29, y+10, engine_id, SPRITE_PALETTE(PLAYER_SPRITE_COLOR(_local_player)));
+						y += 24;
+					}
+					sel--;
+				}
+			} while (++engine_id, ++e,--num);
+
+			WP(w,buildtrain_d).sel_engine = selected_id;
+
+			if (selected_id != -1) {
+				Engine *e;
+
+				SET_DPARAM32(0, _aircraft_cost_table[selected_id - AIRCRAFT_ENGINES_INDEX] * (_price.aircraft_base>>3)>>5);
+				SET_DPARAM16(1, _aircraft_speed[selected_id - AIRCRAFT_ENGINES_INDEX] * 8);
+				SET_DPARAM16(2, _aircraft_num_pass[selected_id - AIRCRAFT_ENGINES_INDEX]);
+				SET_DPARAM16(3, _aircraft_num_mail[selected_id - AIRCRAFT_ENGINES_INDEX]);
+				SET_DPARAM32(4,_aircraft_running_cost[selected_id - AIRCRAFT_ENGINES_INDEX] * _price.aircraft_running >> 8);
+
+				e = &_engines[selected_id];
+				SET_DPARAM16(6, e->lifelength);
+				SET_DPARAM8(7, e->reliability * 100 >> 16);
+				ConvertDayToYMD(&ymd, e->intro_date);
+				SET_DPARAM16(5, ymd.year + 1920);
+
+				DrawString(2, 111, STR_A007_COST_SPEED_CAPACITY_PASSENGERS, 0);
+			}
+		}
+	} break;
+
+	case WE_CLICK:
+		switch(e->click.widget) {
+		case 2: { /* listbox */
+			uint i = (e->click.pt.y - 14) / 24;
+			if (i < 4) {
+				WP(w,buildtrain_d).sel_index = i + w->vscroll.pos;
+				SetWindowDirty(w);
+			}
+		} break;
+
+		case 5: { /* build */
+			int sel_eng = WP(w,buildtrain_d).sel_engine;
+			if (sel_eng != -1)
+				DoCommandP(w->window_number, sel_eng, 0, CcBuildAircraft, CMD_BUILD_AIRCRAFT | CMD_MSG(STR_A008_CAN_T_BUILD_AIRCRAFT));
+		} break;
+
+		case 6:	/* rename */
+			WP(w,buildtrain_d).rename_engine = WP(w,buildtrain_d).sel_engine;
+			ShowQueryString(
+				GetCustomEngineName(WP(w,buildtrain_d).sel_engine),
+				STR_A039_RENAME_AIRCRAFT_TYPE,
+				31,
+				160,
+				w->window_class,
+				w->window_number);
+			break;
+		}
+		break;
+
+	case WE_4:
+		if (w->window_number != 0 && !FindWindowById(WC_VEHICLE_DEPOT, w->window_number)) {
+			DeleteWindow(w);
+		}
+		break;
+
+	case WE_ON_EDIT_TEXT: {
+		byte *b = e->edittext.str;
+		if (*b == 0)
+			return;
+		memcpy(_decode_parameters, b, 32);
+		DoCommandP(0, WP(w,buildtrain_d).rename_engine, 0, NULL, CMD_RENAME_ENGINE | CMD_MSG(STR_A03A_CAN_T_RENAME_AIRCRAFT_TYPE));
+	} break;
+	}
+}
+
+static const Widget _new_aircraft_widgets[] = {
+{    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
+{    WWT_CAPTION,    14,    11,   239,     0,    13, STR_A005_NEW_AIRCRAFT, STR_018C_WINDOW_TITLE_DRAG_THIS},
+{     WWT_MATRIX,    14,     0,   228,    14,   109, 0x401, STR_A025_AIRCRAFT_SELECTION_LIST},
+{  WWT_SCROLLBAR,    14,   229,   239,    14,   109, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST},
+{     WWT_IMGBTN,    14,     0,   239,   110,   161, 0x0, 0},
+{ WWT_PUSHTXTBTN,    14,     0,   119,   162,   173, STR_A006_BUILD_AIRCRAFT, STR_A026_BUILD_THE_HIGHLIGHTED_AIRCRAFT},
+{ WWT_PUSHTXTBTN,    14,   120,   239,   162,   173, STR_A037_RENAME, STR_A038_RENAME_AIRCRAFT_TYPE},
+{      WWT_LAST},
+};
+
+static const WindowDesc _new_aircraft_desc = {
+	-1, -1, 240, 174,
+	WC_BUILD_VEHICLE,0,
+	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
+	_new_aircraft_widgets,
+	NewAircraftWndProc
+};
+
+static void ShowBuildAircraftWindow(uint tile)
+{
+	Window *w;
+
+	DeleteWindowById(WC_BUILD_VEHICLE, tile);
+
+	w = AllocateWindowDesc(&_new_aircraft_desc);
+	w->window_number = tile;
+	w->vscroll.cap = 4;
+
+	if (tile != 0) {
+		w->caption_color = _map_owner[tile];
+	} else {
+		w->caption_color = _local_player;
+	}
+}
+
+const byte _aircraft_refit_normal[] = { 0,1,4,5,6,7,8,9,10,0xFF };
+const byte _aircraft_refit_arctic[] = { 0,1,4,5,6,7,9,11,10,0xFF };
+const byte _aircraft_refit_desert[] = { 0,4,5,8,6,7,9,10,0xFF };
+const byte _aircraft_refit_candy[] = { 0,1,3,5,7,8,9,6,4,10,11,0xFF };
+
+const byte * const _aircraft_refit_types[4] = {
+	_aircraft_refit_normal, _aircraft_refit_arctic, _aircraft_refit_desert, _aircraft_refit_candy
+};
+
+static void AircraftRefitWndProc(Window *w, WindowEvent *e)
+{
+	switch(e->event) {
+	case WE_PAINT: {
+		Vehicle *v = &_vehicles[w->window_number];
+		const byte *b;
+		int sel;
+		int x,y;
+		byte color;
+		int cargo;
+
+		SET_DPARAM16(0, v->string_id);
+		SET_DPARAM16(1, v->unitnumber);
+		DrawWindowWidgets(w);
+
+		DrawString(1, 15, STR_A040_SELECT_CARGO_TYPE_TO_CARRY, 0);
+
+		cargo = -1;
+		x = 6;
+		y = 25;
+		sel = WP(w,refit_d).sel;
+		b = _aircraft_refit_types[_opt.landscape];
+		do {
+			color = 16;
+			if (sel == 0) {
+				cargo = *b;
+				color = 12;
+			}
+			sel--;
+			DrawString(x,y,_cargoc.names_s[*b], color);
+			y += 10;
+		} while (*++b != 0xFF);
+
+		WP(w,refit_d).cargo = cargo;
+
+		if (cargo != -1) {
+			int32 cost = DoCommandByTile(v->tile, v->index, cargo, DC_QUERY_COST, CMD_REFIT_AIRCRAFT);
+			if (cost != CMD_ERROR) {
+				SET_DPARAM32(2, cost);
+				SET_DPARAM16(0, _cargoc.names_long_p[cargo]);
+				SET_DPARAM16(1, _aircraft_refit_capacity);
+				DrawString(1, 137, STR_A041_NEW_CAPACITY_COST_OF_REFIT, 0);
+			}
+		}
+
+		break;
+	}
+
+	case WE_CLICK:
+		switch(e->click.widget) {
+		case 2: { /* listbox */
+				int y = e->click.pt.y - 25;
+				if (y >= 0) {
+					WP(w,refit_d).sel = y / 10;
+					SetWindowDirty(w);
+				}
+			} break;
+		case 4: /* refit button */
+			if (WP(w,refit_d).cargo != 0xFF) {
+				Vehicle *v = &_vehicles[w->window_number];
+				if (DoCommandP(v->tile, v->index, WP(w,refit_d).cargo, NULL, CMD_REFIT_AIRCRAFT | CMD_MSG(STR_A042_CAN_T_REFIT_AIRCRAFT)))
+					DeleteWindow(w);
+			}
+		  break;
+		}
+		break;
+	}
+}
+
+static const Widget _aircraft_refit_widgets[] = {
+{    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
+{    WWT_CAPTION,    14,    11,   239,     0,    13, STR_A03C_REFIT, STR_018C_WINDOW_TITLE_DRAG_THIS},
+{     WWT_IMGBTN,    14,     0,   239,    14,   135, 0x0, STR_A03E_SELECT_TYPE_OF_CARGO_FOR},
+{     WWT_IMGBTN,    14,     0,   239,   136,   157, 0x0},
+{ WWT_PUSHTXTBTN,    14,     0,   239,   158,   169, STR_A03D_REFIT_AIRCRAFT, STR_A03F_REFIT_AIRCRAFT_TO_CARRY},
+{      WWT_LAST},
+};
+
+static const WindowDesc _aircraft_refit_desc = {
+	-1,-1, 240, 170,
+	WC_VEHICLE_REFIT,WC_VEHICLE_VIEW,
+	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
+	_aircraft_refit_widgets,
+	AircraftRefitWndProc
+};
+
+static void ShowAircraftRefitWindow(Vehicle *v)
+{
+	Window *w;
+
+	DeleteWindowById(WC_VEHICLE_REFIT, v->index);
+
+	_alloc_wnd_parent_num = v->index;
+	w = AllocateWindowDesc(&_aircraft_refit_desc);
+	w->window_number = v->index;
+	w->caption_color = v->owner;
+	WP(w,refit_d).sel = -1;
+}
+
+static void AircraftDetailsWndProc(Window *w, WindowEvent *e)
+{
+	int mod;
+	Vehicle *v = &_vehicles[w->window_number], *u;
+
+	switch(e->event) {
+	case WE_PAINT:
+		w->disabled_state = v->owner == _local_player ? 0 : (1 << 2);
+		SET_DPARAM16(0, v->string_id);
+		SET_DPARAM16(1, v->unitnumber);
+		DrawWindowWidgets(w);
+
+		/* Draw running cost */
+		{
+			int year = v->age / 366;
+			StringID str;
+
+			SET_DPARAM16(1, year);
+
+			str = STR_0199_YEAR;
+			if (year != 1) {
+				str++;
+				if (v->max_age - 366 < v->age)
+					str++;
+			}
+			SET_DPARAM16(0, str);
+			SET_DPARAM16(2, v->max_age / 366);
+			SET_DPARAM32(3, _price.aircraft_running * _aircraft_running_cost[v->engine_type - AIRCRAFT_ENGINES_INDEX] >> 8);
+			DrawString(2, 15, STR_A00D_AGE_RUNNING_COST_YR, 0);
+		}
+
+		/* Draw max speed */
+		{
+			SET_DPARAM16(0, v->max_speed * 8);
+			DrawString(2, 25, STR_A00E_MAX_SPEED, 0);
+		}
+
+		/* Draw profit */
+		{
+			SET_DPARAM32(0, v->profit_this_year);
+			SET_DPARAM32(1, v->profit_last_year);
+			DrawString(2, 35, STR_A00F_PROFIT_THIS_YEAR_LAST_YEAR, 0);
+		}
+
+		/* Draw breakdown & reliability */
+		{
+			SET_DPARAM8(0, v->reliability * 100 >> 16);
+			SET_DPARAM16(1, v->breakdowns_since_last_service);
+			DrawString(2, 45, STR_A010_RELIABILITY_BREAKDOWNS, 0);
+		}
+
+		/* Draw service interval text */
+		{
+			SET_DPARAM16(0, v->service_interval);
+			SET_DPARAM16(1, v->date_of_last_service);
+			DrawString(13, 103, STR_883C_SERVICING_INTERVAL_DAYS, 0);
+		}
+
+		DrawAircraftImage(v, 3, 57, INVALID_VEHICLE);
+
+		{
+			int y = 57;
+
+			do {
+				if (v->subtype <= 2) {
+					SET_DPARAM16(0, GetCustomEngineName(v->engine_type));
+					SET_DPARAM16(1, 1920 + v->build_year);
+					SET_DPARAM32(2, v->value);
+					DrawString(60, y, STR_A011_BUILT_VALUE, 0);
+					y += 10;
+
+					SET_DPARAM16(0, _cargoc.names_long_p[v->cargo_type]);
+					SET_DPARAM16(1, v->cargo_cap);
+					u = v->next;
+					SET_DPARAM16(2, _cargoc.names_long_p[u->cargo_type]);
+					SET_DPARAM16(3, u->cargo_cap);
+					DrawString(60, y, STR_A019_CAPACITY + (u->cargo_cap == 0), 0);
+					y += 14;
+				}
+
+				if (v->cargo_count != 0) {
+
+					/* Cargo names (fix pluralness) */
+					SET_DPARAM8(0, v->cargo_type);
+					SET_DPARAM16(1, v->cargo_count);
+					SET_DPARAM16(2, v->cargo_source);
+					DrawString(60, y, STR_8813_FROM, 0);
+
+					y += 10;
+				}
+			} while ( (v=v->next) != NULL);
+		}
+		break;
+
+	case WE_CLICK:
+		switch(e->click.widget) {
+		case 2: /* rename */
+			SET_DPARAM16(0, v->unitnumber);
+			ShowQueryString(v->string_id, STR_A030_NAME_AIRCRAFT, 31, 150, w->window_class, w->window_number);
+			break;
+
+		case 5: /* increase int */
+			mod = 10;
+			goto change_int;
+		case 6: /* decrease int */
+			mod = -10;
+change_int:
+			mod += v->service_interval;
+			if (!IS_INT_INSIDE(mod, 30, 800+1))
+				return;
+			DoCommandP(v->tile, v->index, mod, NULL,
+				CMD_CHANGE_AIRCRAFT_SERVICE_INT | CMD_MSG(STR_018A_CAN_T_CHANGE_SERVICING));
+			break;
+		}
+		break;
+
+	case WE_4:
+		if (FindWindowById(WC_VEHICLE_VIEW, w->window_number) == NULL)
+			DeleteWindow(w);
+		break;
+
+	case WE_ON_EDIT_TEXT: {
+		byte *b = e->edittext.str;
+		if (*b == 0)
+			return;
+		memcpy(_decode_parameters, b, 32);
+		DoCommandP(0, w->window_number, 0, NULL, CMD_NAME_VEHICLE | CMD_MSG(STR_A031_CAN_T_NAME_AIRCRAFT));
+	} break;
+
+	}
+}
+
+
+static const Widget _aircraft_details_widgets[] = {
+{    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
+{    WWT_CAPTION,    14,    11,   349,     0,    13, STR_A00C_DETAILS, STR_018C_WINDOW_TITLE_DRAG_THIS},
+{ WWT_PUSHTXTBTN,    14,   350,   389,     0,    13, STR_01AA_NAME, STR_A032_NAME_AIRCRAFT},
+{     WWT_IMGBTN,    14,     0,   389,    14,    55, 0x0},
+{     WWT_IMGBTN,    14,     0,   389,    56,   101, 0x0},
+{ WWT_PUSHTXTBTN,    14,     0,    10,   102,   107, STR_0188, STR_884D_INCREASE_SERVICING_INTERVAL},
+{ WWT_PUSHTXTBTN,    14,     0,    10,   108,   113, STR_0189, STR_884E_DECREASE_SERVICING_INTERVAL},
+{     WWT_IMGBTN,    14,    11,   389,   102,   113, 0x0},
+{      WWT_LAST},
+};
+
+static const WindowDesc _aircraft_details_desc = {
+	-1,-1, 390, 114,
+	WC_VEHICLE_DETAILS,WC_VEHICLE_VIEW,
+	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
+	_aircraft_details_widgets,
+	AircraftDetailsWndProc
+};
+
+
+static void ShowAircraftDetailsWindow(Vehicle *v)
+{
+	Window *w;
+	VehicleID veh = v->index;
+
+	DeleteWindowById(WC_VEHICLE_ORDERS, veh);
+	DeleteWindowById(WC_VEHICLE_DETAILS, veh);
+
+	_alloc_wnd_parent_num = veh;
+	w = AllocateWindowDesc(&_aircraft_details_desc);
+	w->window_number = veh;
+	w->caption_color = v->owner;
+//	w->vscroll.cap = 6;
+//	w->traindetails_d.tab = 0;
+}
+
+
+static const Widget _aircraft_view_widgets[] = {
+{    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
+{    WWT_CAPTION,    14,    11,   249,     0,    13, STR_A00A, STR_018C_WINDOW_TITLE_DRAG_THIS},
+{     WWT_IMGBTN,    14,     0,   231,    14,   103, 0x0, 0},
+{          WWT_6,    14,     2,   229,    16,   101, 0x0, 0},
+{ WWT_PUSHIMGBTN,    14,     0,   249,   104,   115, 0x0, STR_A027_CURRENT_AIRCRAFT_ACTION},
+{ WWT_PUSHIMGBTN,    14,   232,   249,    14,    31, 0x2AB, STR_A029_CENTER_MAIN_VIEW_ON_AIRCRAFT},
+{ WWT_PUSHIMGBTN,    14,   232,   249,    32,    49, 0x2AF, STR_A02A_SEND_AIRCRAFT_TO_HANGAR},
+{ WWT_PUSHIMGBTN,    14,   232,   249,    50,    67, 0x2B4, STR_A03B_REFIT_AIRCRAFT_TO_CARRY},
+{ WWT_PUSHIMGBTN,    14,   232,   249,    68,    85, 0x2B2, STR_A028_SHOW_AIRCRAFT_S_ORDERS},
+{ WWT_PUSHIMGBTN,    14,   232,   249,    86,   103, 0x2B3, STR_A02B_SHOW_AIRCRAFT_DETAILS},
+{      WWT_LAST},
+};
+
+static void AircraftViewWndProc(Window *w, WindowEvent *e)
+{
+	switch(e->event) {
+	case WE_PAINT: {
+		Vehicle *v = &_vehicles[w->window_number];
+		uint32 disabled = 1<<7;
+		StringID str;
+
+		{
+			uint tile = v->tile;
+			if (IS_TILETYPE(tile, MP_STATION) &&
+					(_map5[tile] == 32 || _map5[tile] == 65) &&
+					v->vehstatus&VS_STOPPED)
+						disabled = 0;
+		}
+
+		if (v->owner != _local_player)
+			disabled |= 1<<7 | 1<<6;
+		w->disabled_state = disabled;
+
+		/* draw widgets & caption */
+		SET_DPARAM16(0, v->string_id);
+		SET_DPARAM16(1, v->unitnumber);
+		DrawWindowWidgets(w);
+
+		/* draw the flag */
+		DrawSprite((v->vehstatus & VS_STOPPED) ? 0xC12  : 0xC13, 2, 105);
+
+		if (v->vehstatus & VS_CRASHED) {
+			str = STR_8863_CRASHED;
+		} else if (v->vehstatus & VS_STOPPED) {
+			str = STR_8861_STOPPED;
+		} else {
+			switch(v->next_order & OT_MASK) {
+			case OT_GOTO_STATION: {
+				SET_DPARAM16(0, v->next_order_param);
+				SET_DPARAM16(1, v->cur_speed * 8);
+				str = STR_HEADING_FOR_STATION + _patches.vehicle_speed;
+			} break;
+
+			case OT_GOTO_DEPOT: {
+				SET_DPARAM16(0, v->next_order_param);
+				SET_DPARAM16(1, v->cur_speed * 8);
+				str = STR_HEADING_FOR_HANGAR + _patches.vehicle_speed;
+			} break;
+
+			case OT_LOADING:
+				str = STR_882F_LOADING_UNLOADING;
+				break;
+
+			default:
+				if (v->num_orders == 0) {
+					str = STR_NO_ORDERS + _patches.vehicle_speed;
+					SET_DPARAM16(0, v->cur_speed * 8);
+				} else
+					str = STR_EMPTY;
+				break;
+			}
+		}
+
+		DrawStringCentered(125, 105, str, 0);
+		DrawWindowViewport(w);
+	} break;
+
+	case WE_CLICK: {
+		Vehicle *v = &_vehicles[w->window_number];
+
+		switch(e->click.widget) {
+		case 4: /* start stop */
+			DoCommandP(v->tile, v->index, 0, NULL, CMD_START_STOP_AIRCRAFT | CMD_MSG(STR_A016_CAN_T_STOP_START_AIRCRAFT));
+			break;
+		case 5: /* center main view */
+			ScrollMainWindowTo(v->x_pos, v->y_pos);
+			break;
+		case 6: /* goto hangar */
+			DoCommandP(v->tile, v->index, 0, NULL, CMD_SEND_AIRCRAFT_TO_HANGAR | CMD_MSG(STR_A012_CAN_T_SEND_AIRCRAFT_TO));
+			break;
+		case 7: /* refit */
+			ShowAircraftRefitWindow(v);
+			break;
+		case 8: /* show orders */
+			ShowOrdersWindow(v);
+			break;
+		case 9: /* show details */
+			ShowAircraftDetailsWindow(v);
+			break;
+		}
+	} break;
+
+	case WE_DESTROY:
+		DeleteWindowById(WC_VEHICLE_ORDERS, w->window_number);
+		DeleteWindowById(WC_VEHICLE_REFIT, w->window_number);
+		DeleteWindowById(WC_VEHICLE_DETAILS, w->window_number);
+		break;
+	}
+}
+
+
+static const WindowDesc _aircraft_view_desc = {
+	-1,-1, 250, 116,
+	WC_VEHICLE_VIEW ,0,
+	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
+	_aircraft_view_widgets,
+	AircraftViewWndProc
+};
+
+
+void ShowAircraftViewWindow(Vehicle *v)
+{
+	Window *w;
+
+	w = AllocateWindowDescFront(&_aircraft_view_desc, v->index);
+	if (w) {
+		w->caption_color = v->owner;
+		AssignWindowViewport(w, 3, 17, 0xE2, 0x54, w->window_number | (1 << 31), 0);
+	}
+}
+
+static void DrawAircraftDepotWindow(Window *w)
+{
+	uint tile;
+	Vehicle *v;
+	int num,x,y;
+
+	tile = w->window_number;
+
+	/* setup disabled buttons */
+	w->disabled_state = (_map_owner[tile]==_local_player) ? 0 : ((1<<3)|(1<<5));
+
+	/* determine amount of items for scroller */
+	num = 0;
+	FOR_ALL_VEHICLES(v) {
+		if (v->type == VEH_Aircraft && v->subtype <= 2 && v->vehstatus&VS_HIDDEN &&
+				v->tile == (TileIndex)tile)
+					num++;
+	}
+	SetVScrollCount(w, (num + 3) >> 2);
+
+	SET_DPARAM16(0, _map2[tile]);
+	DrawWindowWidgets(w);
+
+	x = 2;
+	y = 15;
+	num = w->vscroll.pos * 4;
+
+	FOR_ALL_VEHICLES(v) {
+		if (v->type == VEH_Aircraft &&
+				v->subtype <= 2 &&
+				v->vehstatus&VS_HIDDEN &&
+				v->tile == (TileIndex)tile &&
+				--num < 0 && num >=	-8) {
+
+			DrawAircraftImage(v, x+12, y, WP(w,traindepot_d).sel);
+
+			SET_DPARAM16(0, v->unitnumber);
+			DrawString(x, y+2, (uint16)(v->max_age-366) >= v->age ? STR_00E2 : STR_00E3, 0);
+
+			DrawSprite( (v->vehstatus & VS_STOPPED) ? 0xC12 : 0xC13, x, y+12);
+
+			if ((x+=74) == 2+74*4) {
+				x -= 74*4;
+				y += 24;
+			}
+		}
+	}
+}
+
+static int GetVehicleFromAircraftDepotWndPt(Window *w, int x, int y, Vehicle **veh) {
+	uint xt,yt,xm,ym;
+	Vehicle *v;
+	uint tile;
+	int pos;
+
+	xt = x / 74;
+	xm = x % 74;
+	if (xt >= 4)
+		return 1;
+
+	yt = (y - 14) / 24;
+	ym = (y - 14) % 24;
+	if (yt >= 2)
+		return 1;
+
+	pos = (yt + w->vscroll.pos) * 4 + xt;
+
+	tile = w->window_number;
+	FOR_ALL_VEHICLES(v) {
+		if (v->type == VEH_Aircraft &&
+				v->subtype <= 2 &&
+				v->vehstatus&VS_HIDDEN &&
+				v->tile == (TileIndex)tile &&
+				--pos < 0) {
+					*veh = v;
+					if (xm >= 12)
+						return 0;
+
+					if (ym <= 12)
+						return -1; /* show window */
+
+					return -2; /* start stop */
+				}
+	}
+	return 1; /* outside */
+}
+
+static void AircraftDepotClickAircraft(Window *w, int x, int y)
+{
+	Vehicle *v;
+
+	switch(GetVehicleFromAircraftDepotWndPt(w, x, y, &v)) {
+	case 1:
+		return;
+
+	case 0:
+		if (v != NULL) {
+			WP(w,traindepot_d).sel = v->index;
+			SetWindowDirty(w);
+			SetObjectToPlaceWnd( SPRITE_PALETTE(PLAYER_SPRITE_COLOR(v->owner)) + GetAircraftImage(v, 6), 4, w);
+		}
+		break;
+
+	case -1:
+		ShowAircraftViewWindow(v);
+		break;
+
+	case -2:
+		DoCommandP(v->tile, v->index, 0, NULL, CMD_START_STOP_AIRCRAFT | CMD_MSG(STR_A016_CAN_T_STOP_START_AIRCRAFT));
+		break;
+
+	default:
+		NOT_REACHED();
+	}
+}
+
+static const Widget _aircraft_depot_widgets[] = {
+{    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
+{    WWT_CAPTION,    14,    11,   330,     0,    13, STR_A002_AIRCRAFT_HANGAR, STR_018C_WINDOW_TITLE_DRAG_THIS},
+{     WWT_MATRIX,    14,     0,   295,    14,    61, 0x204, STR_A021_AIRCRAFT_CLICK_ON_AIRCRAFT},
+{     WWT_IMGBTN,    14,   296,   319,    14,    61, 0x2A9, STR_A023_DRAG_AIRCRAFT_TO_HERE_TO},
+{  WWT_SCROLLBAR,    14,   320,   330,    14,    61, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST},
+{ WWT_PUSHTXTBTN,    14,     0,   164,    62,    73, STR_A003_NEW_AIRCRAFT, STR_A022_BUILD_NEW_AIRCRAFT},
+{ WWT_PUSHTXTBTN,    14,   165,   330,    62,    73, STR_00E4_LOCATION, STR_A024_CENTER_MAIN_VIEW_ON_HANGAR},
+{      WWT_LAST},
+};
+
+
+static void AircraftDepotWndProc(Window *w, WindowEvent *e)
+{
+	switch(e->event) {
+	case WE_PAINT:
+		DrawAircraftDepotWindow(w);
+		break;
+
+	case WE_CLICK:
+		switch(e->click.widget) {
+		case 2: /* click aircraft */
+			AircraftDepotClickAircraft(w, e->click.pt.x, e->click.pt.y);
+			break;
+		case 5: /* show build aircraft window */
+			ShowBuildAircraftWindow(w->window_number);
+			break;
+		case 6: /* scroll to tile */
+			ScrollMainWindowToTile(w->window_number);
+			break;
+		}
+		break;
+
+	case WE_DESTROY:
+		DeleteWindowById(WC_BUILD_VEHICLE, w->window_number);
+		break;
+
+	case WE_DRAGDROP: {
+		switch(e->click.widget) {
+		case 2: {
+			Vehicle *v;
+			VehicleID sel = WP(w,traindepot_d).sel;
+
+			WP(w,traindepot_d).sel = INVALID_VEHICLE;
+			SetWindowDirty(w);
+
+			if (GetVehicleFromAircraftDepotWndPt(w, e->dragdrop.pt.x, e->dragdrop.pt.y, &v) == 0 &&
+					v != NULL &&
+					sel == v->index) {
+				ShowAircraftViewWindow(v);
+			}
+		} break;
+
+		case 3:
+			if (!HASBIT(w->disabled_state, 3) &&
+					WP(w,traindepot_d).sel != INVALID_VEHICLE)	{
+				Vehicle *v;
+
+				HandleButtonClick(w, 3);
+
+				v = &_vehicles[WP(w,traindepot_d).sel];
+				WP(w,traindepot_d).sel = INVALID_VEHICLE;
+
+				_backup_orders_tile = v->tile;
+				BackupVehicleOrders(v, _backup_orders_data);
+
+				if (!DoCommandP(v->tile, v->index, 0, NULL,  CMD_SELL_AIRCRAFT | CMD_MSG(STR_A01C_CAN_T_SELL_AIRCRAFT)))
+					_backup_orders_tile = 0;
+			}
+			break;
+		default:
+			WP(w,traindepot_d).sel = INVALID_VEHICLE;
+			SetWindowDirty(w);
+		}
+		break;
+	}
+	break;
+	}
+}
+
+
+
+static const WindowDesc _aircraft_depot_desc = {
+	-1, -1, 331, 74,
+	WC_VEHICLE_DEPOT,0,
+	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
+	_aircraft_depot_widgets,
+	AircraftDepotWndProc
+};
+
+
+void ShowAircraftDepotWindow(uint tile)
+{
+	Window *w;
+
+	w = AllocateWindowDescFront(&_aircraft_depot_desc, tile);
+	if (w) {
+		w->caption_color = _map_owner[tile];
+		w->vscroll.cap = 2;
+		WP(w,traindepot_d).sel = INVALID_VEHICLE;
+		_backup_orders_tile = 0;
+	}
+}
+
+static void DrawSmallSchedule(Vehicle *v, int x, int y) {
+	uint16 *sched;
+	int sel;
+	uint ord;
+	int i = 0;
+
+	sched = v->schedule_ptr;
+	sel = v->cur_order_index;
+
+	while ((ord=*sched++) != 0) {
+		if (sel == 0) {
+			_stringwidth_base = 0xE0;
+			DoDrawString( "\xAF", x-6, y, 16);
+			_stringwidth_base = 0;
+		}
+		sel--;
+
+		if ((ord & OT_MASK) == OT_GOTO_STATION) {
+			SET_DPARAM16(0, ord >> 8);
+			DrawString(x, y, STR_A036, 0);
+
+			y += 6;
+			if (++i == 4)
+				break;
+		}
+	}
+}
+
+static void PlayerAircraftWndProc(Window *w, WindowEvent *e)
+{
+	switch(e->event) {
+	case WE_PAINT:
+		/* determine amount of items for scroller */
+		{
+			Vehicle *v;
+			int num = 0;
+			byte owner = (byte)w->window_number;
+
+			FOR_ALL_VEHICLES(v) {
+				if (v->type == VEH_Aircraft && v->subtype <= 2 && v->owner == owner)
+					num++;
+			}
+
+			SetVScrollCount(w, num);
+		}
+
+		/* draw the widgets */
+		{
+			Player *p = DEREF_PLAYER(w->window_number);
+			SET_DPARAM16(0, p->name_1);
+			SET_DPARAM32(1, p->name_2);
+			DrawWindowWidgets(w);
+		}
+
+		/* draw the aircraft */
+		{
+			Vehicle *v;
+			int pos = w->vscroll.pos;
+			byte owner = (byte)w->window_number;
+			int x = 2;
+			int y = 15;
+
+			FOR_ALL_VEHICLES(v) {
+				if (v->type == VEH_Aircraft && v->subtype <= 2 && v->owner == owner &&
+						--pos < 0 && pos >= -4) {
+					StringID str;
+
+					DrawAircraftImage(v, x + 19, y + 6, INVALID_VEHICLE);
+					DrawVehicleProfitButton(v, x, y+13);
+
+					SET_DPARAM16(0, v->unitnumber);
+					if (IsAircraftHangarTile(v->tile)) {
+						str = STR_021F;
+					} else {
+						str = v->age > v->max_age - 366 ? STR_00E3 : STR_00E2;
+					}
+					DrawString(x, y+2, str, 0);
+
+					SET_DPARAM32(0, v->profit_this_year);
+					SET_DPARAM32(1, v->profit_last_year);
+					DrawString(x+19, y + 28, STR_0198_PROFIT_THIS_YEAR_LAST_YEAR, 0);
+
+					if (v->string_id != STR_SV_AIRCRAFT_NAME) {
+						SET_DPARAM16(0, v->string_id);
+						DrawString(x+19, y, STR_01AB, 0);
+					}
+
+					DrawSmallSchedule(v, x+136, y);
+
+					y += 36;
+				}
+			}
+		}
+		break;
+
+	case WE_CLICK:
+		switch(e->click.widget) {
+		case 2: { /* click on aircraft */
+			int sel;
+			Vehicle *v;
+			byte owner;
+
+			sel = (e->click.pt.y - 14) / 36;
+
+			if ((uint)sel >= 4)
+				break;
+			sel += w->vscroll.pos;
+			owner = (byte)w->window_number;
+			FOR_ALL_VEHICLES(v) {
+				if (v->type == VEH_Aircraft && v->subtype <= 2 && v->owner == owner &&
+						--sel < 0) {
+					ShowAircraftViewWindow(v);
+					break;
+				}
+			}
+			break;
+		}
+		case 4: { /* build new */
+			uint tile;
+
+			tile = _last_built_aircraft_depot_tile;
+			do {
+				if (_map_owner[tile] == _local_player &&
+						IsAircraftHangarTile(tile)) {
+					ShowAircraftDepotWindow(tile);
+					ShowBuildAircraftWindow(tile);
+					return;
+				}
+
+				tile = TILE_MASK(tile + 1);
+			} while(tile != _last_built_aircraft_depot_tile);
+			ShowBuildAircraftWindow(0);
+		} break;
+		}
+		break;
+	}
+}
+
+static const Widget _player_aircraft_widgets[] = {
+{    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
+{    WWT_CAPTION,    14,    11,   259,     0,    13, STR_A009_AIRCRAFT, STR_018C_WINDOW_TITLE_DRAG_THIS},
+{     WWT_MATRIX,    14,     0,   248,    14,   157, 0x401, STR_A01F_AIRCRAFT_CLICK_ON_AIRCRAFT},
+{  WWT_SCROLLBAR,    14,   249,   259,    14,   157, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST},
+{ WWT_PUSHTXTBTN,    14,     0,   129,   158,   169, STR_A003_NEW_AIRCRAFT, STR_A020_BUILD_NEW_AIRCRAFT_REQUIRES},
+{     WWT_IMGBTN,    14,   130,   259,   158,   169, 0x0, 0},
+{      WWT_LAST},
+};
+
+static const WindowDesc _player_aircraft_desc = {
+	-1, -1, 260, 170,
+	WC_AIRCRAFT_LIST,0,
+	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
+	_player_aircraft_widgets,
+	PlayerAircraftWndProc
+};
+
+static const Widget _other_player_aircraft_widgets[] = {
+{    WWT_TEXTBTN,    14,     0,    10,     0,    13, STR_00C5, STR_018B_CLOSE_WINDOW},
+{    WWT_CAPTION,    14,    11,   259,     0,    13, STR_A009_AIRCRAFT, STR_018C_WINDOW_TITLE_DRAG_THIS},
+{     WWT_MATRIX,    14,     0,   248,    14,   157, 0x401, STR_A01F_AIRCRAFT_CLICK_ON_AIRCRAFT},
+{  WWT_SCROLLBAR,    14,   249,   259,    14,   157, 0x0, STR_0190_SCROLL_BAR_SCROLLS_LIST},
+{      WWT_LAST},
+};
+
+static const WindowDesc _other_player_aircraft_desc = {
+	-1, -1, 260, 158,
+	WC_AIRCRAFT_LIST,0,
+	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET,
+	_other_player_aircraft_widgets,
+	PlayerAircraftWndProc
+};
+
+void ShowPlayerAircraft(int player)
+{
+	Window *w;
+
+	if ( player == _local_player) {
+		w = AllocateWindowDescFront(&_player_aircraft_desc, player);
+	} else  {
+		w = AllocateWindowDescFront(&_other_player_aircraft_desc, player);
+	}
+
+	if (w) {
+		w->caption_color = w->window_number;
+		w->vscroll.cap = 4;
+	}
+}