(svn r6712) -Code cleanup: renamed buildtrain_d to buildvehicle_d as it's used for all vehicle types

6 files changed, 144 insertions, 144 deletions

diff --git a/aircraft_gui.c b/aircraft_gui.c
index 7b501ea6a..6f358e1af 100644
--- a/aircraft_gui.c
+++ b/aircraft_gui.c
@@ -345,10 +345,10 @@ static void GenerateBuildList(EngineID **planes, uint16 *num_planes, EngineID **
 
 static inline EngineID *GetEngineArray(Window *w)
 {
-	switch (WP(w,buildtrain_d).show_engine_button) {
-		case 1: return WP(w, buildtrain_d).list_a;
-		case 2: return WP(w, buildtrain_d).list_b;
-		case 3: return WP(w, buildtrain_d).list_c;
+	switch (WP(w,buildvehicle_d).show_engine_button) {
+		case 1: return WP(w, buildvehicle_d).list_a;
+		case 2: return WP(w, buildvehicle_d).list_b;
+		case 3: return WP(w, buildvehicle_d).list_c;
 		default: NOT_REACHED();
 	}
 	return NULL;
@@ -356,10 +356,10 @@ static inline EngineID *GetEngineArray(Window *w)
 
 static inline uint16 GetEngineArrayLength(Window *w)
 {
-	switch (WP(w,buildtrain_d).show_engine_button) {
-		case 1: return WP(w, buildtrain_d).list_a_length;
-		case 2: return WP(w, buildtrain_d).list_b_length;
-		case 3: return WP(w, buildtrain_d).list_c_length;
+	switch (WP(w,buildvehicle_d).show_engine_button) {
+		case 1: return WP(w, buildvehicle_d).list_a_length;
+		case 2: return WP(w, buildvehicle_d).list_b_length;
+		case 3: return WP(w, buildvehicle_d).list_c_length;
 		default: NOT_REACHED();
 	}
 	return 0;
@@ -367,50 +367,50 @@ static inline uint16 GetEngineArrayLength(Window *w)
 
 static void SortAircraftBuildList(Window *w)
 {
-	_internal_sort_order = WP(w,buildtrain_d).decenting_sort_order;
+	_internal_sort_order = WP(w,buildvehicle_d).decenting_sort_order;
 	qsort((void*)GetEngineArray(w), GetEngineArrayLength(w), sizeof(GetEngineArray(w)[0]),
-		  _engine_sorter[WP(w,buildtrain_d).sort_criteria]);
+		  _engine_sorter[WP(w,buildvehicle_d).sort_criteria]);
 }
 
 static void DrawBuildAircraftWindow(Window *w)
 {
-	SetWindowWidgetLoweredState(w, BUILD_AIRCRAFT_WIDGET_PLANES,      WP(w,buildtrain_d).show_engine_button == 1);
-	SetWindowWidgetLoweredState(w, BUILD_AIRCRAFT_WIDGET_JETS,        WP(w,buildtrain_d).show_engine_button == 2);
-	SetWindowWidgetLoweredState(w, BUILD_AIRCRAFT_WIDGET_HELICOPTERS, WP(w,buildtrain_d).show_engine_button == 3);
+	SetWindowWidgetLoweredState(w, BUILD_AIRCRAFT_WIDGET_PLANES,      WP(w,buildvehicle_d).show_engine_button == 1);
+	SetWindowWidgetLoweredState(w, BUILD_AIRCRAFT_WIDGET_JETS,        WP(w,buildvehicle_d).show_engine_button == 2);
+	SetWindowWidgetLoweredState(w, BUILD_AIRCRAFT_WIDGET_HELICOPTERS, WP(w,buildvehicle_d).show_engine_button == 3);
 
 	SetWindowWidgetDisabledState(w, BUILD_AIRCRAFT_WIDGET_BUILD, w->window_number == 0);
 
-	if (WP(w, buildtrain_d).data_invalidated) {
-		GenerateBuildList(&WP(w, buildtrain_d).list_a, &WP(w, buildtrain_d).list_a_length,
-						  &WP(w, buildtrain_d).list_b, &WP(w, buildtrain_d).list_b_length,
-						  &WP(w, buildtrain_d).list_c, &WP(w, buildtrain_d).list_c_length);
-		WP(w, buildtrain_d).data_invalidated = false;
+	if (WP(w, buildvehicle_d).data_invalidated) {
+		GenerateBuildList(&WP(w, buildvehicle_d).list_a, &WP(w, buildvehicle_d).list_a_length,
+						  &WP(w, buildvehicle_d).list_b, &WP(w, buildvehicle_d).list_b_length,
+						  &WP(w, buildvehicle_d).list_c, &WP(w, buildvehicle_d).list_c_length);
+		WP(w, buildvehicle_d).data_invalidated = false;
 
-		if (WP(w,buildtrain_d).sel_engine != INVALID_ENGINE) {
+		if (WP(w,buildvehicle_d).sel_engine != INVALID_ENGINE) {
 			int i;
 			bool found = false;
-			if (HASBIT(WP(w,buildtrain_d).show_engine_button, 0)) {
+			if (HASBIT(WP(w,buildvehicle_d).show_engine_button, 0)) {
 				for (i = 0; i < GetEngineArrayLength(w); i++) {
-					if (WP(w,buildtrain_d).sel_engine != GetEngineArray(w)[i]) continue;
+					if (WP(w,buildvehicle_d).sel_engine != GetEngineArray(w)[i]) continue;
 					found = true;
 					break;
 				}
 			}
-			if (!found) WP(w,buildtrain_d).sel_engine = INVALID_ENGINE;
+			if (!found) WP(w,buildvehicle_d).sel_engine = INVALID_ENGINE;
 		}
 	}
 
 	SetVScrollCount(w, GetEngineArrayLength(w));
 	DrawWindowWidgets(w);
 
-	if (WP(w,buildtrain_d).sel_engine == INVALID_ENGINE && GetEngineArrayLength(w) != 0) {
-		WP(w,buildtrain_d).sel_engine = GetEngineArray(w)[0];
+	if (WP(w,buildvehicle_d).sel_engine == INVALID_ENGINE && GetEngineArrayLength(w) != 0) {
+		WP(w,buildvehicle_d).sel_engine = GetEngineArray(w)[0];
 	}
 
 	{
 		int x = 2;
 		int y = 27;
-		EngineID selected_id = WP(w,buildtrain_d).sel_engine;
+		EngineID selected_id = WP(w,buildvehicle_d).sel_engine;
 		EngineID eid = w->vscroll.pos;
 		EngineID *list = GetEngineArray(w);
 		uint16 list_length = GetEngineArrayLength(w);
@@ -428,8 +428,8 @@ static void DrawBuildAircraftWindow(Window *w)
 			DrawAircraftPurchaseInfo(x, w->widget[BUILD_AIRCRAFT_WIDGET_PANEL].top + 1, selected_id);
 		}
 	}
-	DrawString(85, 15, _engine_sort_listing[WP(w,buildtrain_d).sort_criteria], 0x10);
-	DoDrawString(WP(w,buildtrain_d).decenting_sort_order ? DOWNARROW : UPARROW, 69, 15, 0x10);
+	DrawString(85, 15, _engine_sort_listing[WP(w,buildvehicle_d).sort_criteria], 0x10);
+	DoDrawString(WP(w,buildvehicle_d).decenting_sort_order ? DOWNARROW : UPARROW, 69, 15, 0x10);
 }
 
 static void BuildAircraftClickEvent(Window *w, WindowEvent *e)
@@ -438,8 +438,8 @@ static void BuildAircraftClickEvent(Window *w, WindowEvent *e)
 
 	switch (e->we.click.widget) {
 		case BUILD_AIRCRAFT_WIDGET_SORT_ASSENDING_DESENTING:
-			WP(w,buildtrain_d).decenting_sort_order = !WP(w,buildtrain_d).decenting_sort_order;
-			_last_sort_order = WP(w,buildtrain_d).decenting_sort_order;
+			WP(w,buildvehicle_d).decenting_sort_order = !WP(w,buildvehicle_d).decenting_sort_order;
+			_last_sort_order = WP(w,buildvehicle_d).decenting_sort_order;
 			SortAircraftBuildList(w);
 			SetWindowDirty(w);
 			break;
@@ -450,39 +450,39 @@ static void BuildAircraftClickEvent(Window *w, WindowEvent *e)
 				i += w->vscroll.pos;
 
 				if (i < GetEngineArrayLength(w)) {
-					WP(w,buildtrain_d).sel_engine = GetEngineArray(w)[i];
+					WP(w,buildvehicle_d).sel_engine = GetEngineArray(w)[i];
 					SetWindowDirty(w);
 				}
 			}
 		} break;
 
 		case BUILD_AIRCRAFT_WIDGET_SORT_TEXT: case BUILD_AIRCRAFT_WIDGET_SORT_DROPDOWN:/* Select sorting criteria dropdown menu */
-			ShowDropDownMenu(w, _engine_sort_listing, WP(w,buildtrain_d).sort_criteria, BUILD_AIRCRAFT_WIDGET_SORT_DROPDOWN, 0, 0);
+			ShowDropDownMenu(w, _engine_sort_listing, WP(w,buildvehicle_d).sort_criteria, BUILD_AIRCRAFT_WIDGET_SORT_DROPDOWN, 0, 0);
 			return;
 
 		case BUILD_AIRCRAFT_WIDGET_HELICOPTERS: click_state++;
 		case BUILD_AIRCRAFT_WIDGET_JETS:        click_state++;
 		case BUILD_AIRCRAFT_WIDGET_PLANES:      click_state++;
 
-			if (WP(w,buildtrain_d).show_engine_button == click_state) break; // We clicked the pressed button
+			if (WP(w,buildvehicle_d).show_engine_button == click_state) break; // We clicked the pressed button
 
-			WP(w,buildtrain_d).sel_engine = INVALID_ENGINE;
-			WP(w,buildtrain_d).show_engine_button = click_state;
+			WP(w,buildvehicle_d).sel_engine = INVALID_ENGINE;
+			WP(w,buildvehicle_d).show_engine_button = click_state;
 			w->vscroll.pos = 0;
 			SortAircraftBuildList(w);
 			SetWindowDirty(w);
 			break;
 
 		case BUILD_AIRCRAFT_WIDGET_BUILD: {
-			EngineID sel_eng = WP(w,buildtrain_d).sel_engine;
+			EngineID sel_eng = WP(w,buildvehicle_d).sel_engine;
 			if (sel_eng != INVALID_ENGINE)
 				DoCommandP(w->window_number, sel_eng, 0, CcBuildAircraft, CMD_BUILD_AIRCRAFT | CMD_MSG(STR_A008_CAN_T_BUILD_AIRCRAFT));
 		} break;
 
 		case BUILD_AIRCRAFT_WIDGET_RENAME: {
-			EngineID sel_eng = WP(w,buildtrain_d).sel_engine;
+			EngineID sel_eng = WP(w,buildvehicle_d).sel_engine;
 			if (sel_eng != INVALID_ENGINE) {
-				WP(w,buildtrain_d).rename_engine = sel_eng;
+				WP(w,buildvehicle_d).rename_engine = sel_eng;
 				ShowQueryString(GetCustomEngineName(sel_eng),
 								STR_A039_RENAME_AIRCRAFT_TYPE, 31, 160, w->window_class, w->window_number, CS_ALPHANUMERAL);
 			}
@@ -494,46 +494,46 @@ static void BuildAircraftWindowCreate(Window *w)
 {
 	TileIndex tile = w->window_number;
 
-	WP(w, buildtrain_d).list_a_length = 0;
-	WP(w, buildtrain_d).list_b_length = 0;
-	WP(w, buildtrain_d).list_c_length = 0;
-	WP(w, buildtrain_d).list_a        = NULL;
-	WP(w, buildtrain_d).list_b        = NULL;
-	WP(w, buildtrain_d).list_c        = NULL;
-	WP(w, buildtrain_d).data_invalidated     = false;
-	WP(w, buildtrain_d).sel_engine           = INVALID_ENGINE;
-	WP(w, buildtrain_d).sort_criteria        = _last_sort_criteria;
-	WP(w, buildtrain_d).decenting_sort_order = _last_sort_order;
-
-	GenerateBuildList(&WP(w, buildtrain_d).list_a, &WP(w, buildtrain_d).list_a_length,
-					  &WP(w, buildtrain_d).list_b, &WP(w, buildtrain_d).list_b_length,
-					  &WP(w, buildtrain_d).list_c, &WP(w, buildtrain_d).list_c_length);
+	WP(w, buildvehicle_d).list_a_length = 0;
+	WP(w, buildvehicle_d).list_b_length = 0;
+	WP(w, buildvehicle_d).list_c_length = 0;
+	WP(w, buildvehicle_d).list_a        = NULL;
+	WP(w, buildvehicle_d).list_b        = NULL;
+	WP(w, buildvehicle_d).list_c        = NULL;
+	WP(w, buildvehicle_d).data_invalidated     = false;
+	WP(w, buildvehicle_d).sel_engine           = INVALID_ENGINE;
+	WP(w, buildvehicle_d).sort_criteria        = _last_sort_criteria;
+	WP(w, buildvehicle_d).decenting_sort_order = _last_sort_order;
+
+	GenerateBuildList(&WP(w, buildvehicle_d).list_a, &WP(w, buildvehicle_d).list_a_length,
+					  &WP(w, buildvehicle_d).list_b, &WP(w, buildvehicle_d).list_b_length,
+					  &WP(w, buildvehicle_d).list_c, &WP(w, buildvehicle_d).list_c_length);
 
 	/* Disable the aircraft subtype buttons for the types, that can't be build at the current airport */
 	if (tile == 0) {
-		WP(w, buildtrain_d).show_engine_button = 1;
+		WP(w, buildvehicle_d).show_engine_button = 1;
 	} else {
 		byte acc_planes = GetAirport(GetStationByTile(tile)->airport_type)->acc_planes;
 
-		WP(w, buildtrain_d).show_engine_button = 0;
+		WP(w, buildvehicle_d).show_engine_button = 0;
 		if (acc_planes == HELICOPTERS_ONLY || acc_planes == ALL) {
-			WP(w, buildtrain_d).show_engine_button = 3;
+			WP(w, buildvehicle_d).show_engine_button = 3;
 		} else {
 			DisableWindowWidget(w, BUILD_AIRCRAFT_WIDGET_HELICOPTERS);
 		}
 
 		if (acc_planes == AIRCRAFT_ONLY || acc_planes == ALL) {
 			/* Set the start clicked button to jets if the list isn't empty. If not, then show propeller planes */
-			WP(w, buildtrain_d).show_engine_button = WP(w, buildtrain_d).list_b_length == 0 ? 1 : 2;
+			WP(w, buildvehicle_d).show_engine_button = WP(w, buildvehicle_d).list_b_length == 0 ? 1 : 2;
 		} else {
 			DisableWindowWidget(w, BUILD_AIRCRAFT_WIDGET_JETS);
 			DisableWindowWidget(w, BUILD_AIRCRAFT_WIDGET_PLANES);
 		}
 
-		if (WP(w, buildtrain_d).show_engine_button == 0) {
+		if (WP(w, buildvehicle_d).show_engine_button == 0) {
 			/* No plane type are buildable here */
 			NOT_REACHED();
-			WP(w, buildtrain_d).show_engine_button = 1;
+			WP(w, buildvehicle_d).show_engine_button = 1;
 		}
 	}
 	SortAircraftBuildList(w);
@@ -547,13 +547,13 @@ static void NewAircraftWndProc(Window *w, WindowEvent *e)
 			break;
 
 		case WE_INVALIDATE_DATA:
-			WP(w,buildtrain_d).data_invalidated = true;
+			WP(w,buildvehicle_d).data_invalidated = true;
 			break;
 
 		case WE_DESTROY:
-			free((void*)WP(w, buildtrain_d).list_a);
-			free((void*)WP(w, buildtrain_d).list_b);
-			free((void*)WP(w, buildtrain_d).list_c);
+			free((void*)WP(w, buildvehicle_d).list_a);
+			free((void*)WP(w, buildvehicle_d).list_b);
+			free((void*)WP(w, buildvehicle_d).list_c);
 			break;
 
 		case WE_PAINT:
@@ -567,14 +567,14 @@ static void NewAircraftWndProc(Window *w, WindowEvent *e)
 		case WE_ON_EDIT_TEXT: {
 			if (e->we.edittext.str[0] != '\0') {
 				_cmd_text = e->we.edittext.str;
-				DoCommandP(0, WP(w, buildtrain_d).rename_engine, 0, NULL,
+				DoCommandP(0, WP(w, buildvehicle_d).rename_engine, 0, NULL,
 						   CMD_RENAME_ENGINE | CMD_MSG(STR_A03A_CAN_T_RENAME_AIRCRAFT_TYPE));
 			}
 		} break;
 
 		case WE_DROPDOWN_SELECT: /* we have selected a dropdown item in the list */
-			if (WP(w,buildtrain_d).sort_criteria != e->we.dropdown.index) {
-				WP(w,buildtrain_d).sort_criteria = e->we.dropdown.index;
+			if (WP(w,buildvehicle_d).sort_criteria != e->we.dropdown.index) {
+				WP(w,buildvehicle_d).sort_criteria = e->we.dropdown.index;
 				_last_sort_criteria = e->we.dropdown.index;
 				SortAircraftBuildList(w);
 			}
diff --git a/rail_cmd.c b/rail_cmd.c
index 51b3a979b..877dec669 100644
--- a/rail_cmd.c
+++ b/rail_cmd.c
@@ -893,7 +893,7 @@ static int32 DoConvertRail(TileIndex tile, RailType totype, bool exec)
 			/* Update build vehicle window related to this depot */
 			w = FindWindowById(WC_BUILD_VEHICLE, tile);
 			if (w != NULL) {
-				WP(w,buildtrain_d).railtype = totype;
+				WP(w,buildvehicle_d).railtype = totype;
 				SetWindowDirty(w);
 			}
 
diff --git a/roadveh_gui.c b/roadveh_gui.c
index 84f2ea030..3f853483c 100644
--- a/roadveh_gui.c
+++ b/roadveh_gui.c
@@ -416,7 +416,7 @@ static void DrawNewRoadVehWindow(Window *w)
 	DrawWindowWidgets(w);
 
 	y = 15;
-	sel = WP(w,buildtrain_d).sel_index;
+	sel = WP(w,buildvehicle_d).sel_index;
 	pos = w->vscroll.pos;
 	selected_id = INVALID_ENGINE;
 	for (e = ROAD_ENGINES_INDEX; e < ROAD_ENGINES_INDEX + NUM_ROAD_ENGINES; e++) {
@@ -430,7 +430,7 @@ static void DrawNewRoadVehWindow(Window *w)
 		sel--;
 	}
 
-	WP(w,buildtrain_d).sel_engine = selected_id;
+	WP(w,buildvehicle_d).sel_engine = selected_id;
 	if (selected_id != INVALID_ENGINE) {
 		DrawRoadVehPurchaseInfo(2, w->widget[4].top + 1, selected_id);
 	}
@@ -462,21 +462,21 @@ static void NewRoadVehWndProc(Window *w, WindowEvent *e)
 		case 2: { /* listbox */
 			uint i = (e->we.click.pt.y - 14) / 14;
 			if (i < w->vscroll.cap) {
-				WP(w,buildtrain_d).sel_index = i + w->vscroll.pos;
+				WP(w,buildvehicle_d).sel_index = i + w->vscroll.pos;
 				SetWindowDirty(w);
 			}
 		} break;
 
 		case 5: { /* build */
-			EngineID sel_eng = WP(w,buildtrain_d).sel_engine;
+			EngineID sel_eng = WP(w,buildvehicle_d).sel_engine;
 			if (sel_eng != INVALID_ENGINE)
 				DoCommandP(w->window_number, sel_eng, 0, CcBuildRoadVeh, CMD_BUILD_ROAD_VEH | CMD_MSG(STR_9009_CAN_T_BUILD_ROAD_VEHICLE));
 		} break;
 
 		case 6: { /* rename */
-			EngineID sel_eng = WP(w,buildtrain_d).sel_engine;
+			EngineID sel_eng = WP(w,buildvehicle_d).sel_engine;
 			if (sel_eng != INVALID_ENGINE) {
-				WP(w,buildtrain_d).rename_engine = sel_eng;
+				WP(w,buildvehicle_d).rename_engine = sel_eng;
 				ShowQueryString(GetCustomEngineName(sel_eng),
 					STR_9036_RENAME_ROAD_VEHICLE_TYPE, 31, 160, w->window_class, w->window_number, CS_ALPHANUMERAL);
 			}
@@ -487,7 +487,7 @@ static void NewRoadVehWndProc(Window *w, WindowEvent *e)
 	case WE_ON_EDIT_TEXT:
 		if (e->we.edittext.str[0] != '\0') {
 			_cmd_text = e->we.edittext.str;
-			DoCommandP(0, WP(w, buildtrain_d).rename_engine, 0, NULL,
+			DoCommandP(0, WP(w, buildvehicle_d).rename_engine, 0, NULL,
 				CMD_RENAME_ENGINE | CMD_MSG(STR_9037_CAN_T_RENAME_ROAD_VEHICLE));
 		}
 		break;
diff --git a/ship_gui.c b/ship_gui.c
index 8dd4bd804..48867bb46 100644
--- a/ship_gui.c
+++ b/ship_gui.c
@@ -263,7 +263,7 @@ static void NewShipWndProc(Window *w, WindowEvent *e)
 			DrawWindowWidgets(w);
 
 			y = 15;
-			sel = WP(w,buildtrain_d).sel_index;
+			sel = WP(w,buildvehicle_d).sel_index;
 			pos = w->vscroll.pos;
 			selected_id = INVALID_ENGINE;
 			for (eid = SHIP_ENGINES_INDEX; eid < SHIP_ENGINES_INDEX + NUM_SHIP_ENGINES; eid++) {
@@ -277,7 +277,7 @@ static void NewShipWndProc(Window *w, WindowEvent *e)
 				sel--;
 			}
 
-			WP(w,buildtrain_d).sel_engine = selected_id;
+			WP(w,buildvehicle_d).sel_engine = selected_id;
 
 			if (selected_id != INVALID_ENGINE) {
 				DrawShipPurchaseInfo(2, w->widget[4].top + 1, selected_id);
@@ -290,20 +290,20 @@ static void NewShipWndProc(Window *w, WindowEvent *e)
 		case 2: { /* listbox */
 			uint i = (e->we.click.pt.y - 14) / 24;
 			if (i < w->vscroll.cap) {
-				WP(w,buildtrain_d).sel_index = i + w->vscroll.pos;
+				WP(w,buildvehicle_d).sel_index = i + w->vscroll.pos;
 				SetWindowDirty(w);
 			}
 		} break;
 		case 5: { /* build */
-			EngineID sel_eng = WP(w,buildtrain_d).sel_engine;
+			EngineID sel_eng = WP(w,buildvehicle_d).sel_engine;
 			if (sel_eng != INVALID_ENGINE)
 				DoCommandP(w->window_number, sel_eng, 0, CcBuildShip, CMD_BUILD_SHIP | CMD_MSG(STR_980D_CAN_T_BUILD_SHIP));
 		} break;
 
 		case 6: { /* rename */
-			EngineID sel_eng = WP(w,buildtrain_d).sel_engine;
+			EngineID sel_eng = WP(w,buildvehicle_d).sel_engine;
 			if (sel_eng != INVALID_ENGINE) {
-				WP(w,buildtrain_d).rename_engine = sel_eng;
+				WP(w,buildvehicle_d).rename_engine = sel_eng;
 				ShowQueryString(GetCustomEngineName(sel_eng),
 					STR_9838_RENAME_SHIP_TYPE, 31, 160, w->window_class, w->window_number, CS_ALPHANUMERAL);
 			}
@@ -314,7 +314,7 @@ static void NewShipWndProc(Window *w, WindowEvent *e)
 	case WE_ON_EDIT_TEXT:
 		if (e->we.edittext.str[0] != '\0') {
 			_cmd_text = e->we.edittext.str;
-			DoCommandP(0, WP(w, buildtrain_d).rename_engine, 0, NULL,
+			DoCommandP(0, WP(w, buildvehicle_d).rename_engine, 0, NULL,
 				CMD_RENAME_ENGINE | CMD_MSG(STR_9839_CAN_T_RENAME_SHIP_TYPE));
 		}
 		break;
diff --git a/train_gui.c b/train_gui.c
index b2b93ec57..9e948fb9e 100644
--- a/train_gui.c
+++ b/train_gui.c
@@ -438,9 +438,9 @@ static void GenerateBuildList(EngineID **engines, uint16 *num_engines, EngineID
 
 static void SortTrainBuildList(Window *w)
 {
-	_internal_sort_order = WP(w,buildtrain_d).decenting_sort_order;
-	qsort((void*)WP(w, buildtrain_d).list_a, WP(w, buildtrain_d).list_a_length, sizeof(WP(w, buildtrain_d).list_a[0]),
-		  _engine_sorter[WP(w,buildtrain_d).sort_criteria]);
+	_internal_sort_order = WP(w,buildvehicle_d).decenting_sort_order;
+	qsort((void*)WP(w, buildvehicle_d).list_a, WP(w, buildvehicle_d).list_a_length, sizeof(WP(w, buildvehicle_d).list_a[0]),
+		  _engine_sorter[WP(w,buildvehicle_d).sort_criteria]);
 }
 
 static void DrawTrainBuildWindow(Window *w)
@@ -448,73 +448,73 @@ static void DrawTrainBuildWindow(Window *w)
 	int x = 1;
 	int y = 27;
 	EngineID position = w->vscroll.pos;
-	EngineID selected_id = WP(w,buildtrain_d).sel_engine;
+	EngineID selected_id = WP(w,buildvehicle_d).sel_engine;
 	int max = w->vscroll.pos + w->vscroll.cap;
 	uint16 scrollcount = 0;
 
 	SetWindowWidgetDisabledState(w, BUILD_TRAIN_WIDGET_BUILD, w->window_number == 0); // Disable unless we got a depot to build in
 
 	/* Draw the clicked engine/wagon/both button pressed and unpress the other two */
-	SetWindowWidgetLoweredState(w, BUILD_TRAIN_WIDGET_ENGINES, WP(w,buildtrain_d).show_engine_button == 1);
-	SetWindowWidgetLoweredState(w, BUILD_TRAIN_WIDGET_WAGONS,  WP(w,buildtrain_d).show_engine_button == 2);
-	SetWindowWidgetLoweredState(w, BUILD_TRAIN_WIDGET_BOTH,    WP(w,buildtrain_d).show_engine_button == 3);
+	SetWindowWidgetLoweredState(w, BUILD_TRAIN_WIDGET_ENGINES, WP(w,buildvehicle_d).show_engine_button == 1);
+	SetWindowWidgetLoweredState(w, BUILD_TRAIN_WIDGET_WAGONS,  WP(w,buildvehicle_d).show_engine_button == 2);
+	SetWindowWidgetLoweredState(w, BUILD_TRAIN_WIDGET_BOTH,    WP(w,buildvehicle_d).show_engine_button == 3);
 
-	if (WP(w,buildtrain_d).data_invalidated) {
-		GenerateBuildList(&WP(w, buildtrain_d).list_a, &WP(w, buildtrain_d).list_a_length, &WP(w, buildtrain_d).list_b, &WP(w, buildtrain_d).list_b_length, WP(w,buildtrain_d).railtype);
-		WP(w,buildtrain_d).data_invalidated = false;
+	if (WP(w,buildvehicle_d).data_invalidated) {
+		GenerateBuildList(&WP(w, buildvehicle_d).list_a, &WP(w, buildvehicle_d).list_a_length, &WP(w, buildvehicle_d).list_b, &WP(w, buildvehicle_d).list_b_length, WP(w,buildvehicle_d).railtype);
+		WP(w,buildvehicle_d).data_invalidated = false;
 		SortTrainBuildList(w);
 
 		/* Make sure that the selected engine is still in the list*/
-		if (WP(w,buildtrain_d).sel_engine != INVALID_ENGINE) {
+		if (WP(w,buildvehicle_d).sel_engine != INVALID_ENGINE) {
 			int i;
 			bool found = false;
-			if (HASBIT(WP(w,buildtrain_d).show_engine_button, 0)) {
-				for (i = 0; i < WP(w, buildtrain_d).list_a_length; i++) {
-					if (WP(w,buildtrain_d).sel_engine != WP(w, buildtrain_d).list_a[i]) continue;
+			if (HASBIT(WP(w,buildvehicle_d).show_engine_button, 0)) {
+				for (i = 0; i < WP(w, buildvehicle_d).list_a_length; i++) {
+					if (WP(w,buildvehicle_d).sel_engine != WP(w, buildvehicle_d).list_a[i]) continue;
 					found = true;
 					break;
 				}
 			}
-			if (!found && HASBIT(WP(w,buildtrain_d).show_engine_button, 1)) {
-				for (i = 0; i < WP(w, buildtrain_d).list_b_length; i++) {
-					if (WP(w,buildtrain_d).sel_engine != WP(w, buildtrain_d).list_b[i]) continue;
+			if (!found && HASBIT(WP(w,buildvehicle_d).show_engine_button, 1)) {
+				for (i = 0; i < WP(w, buildvehicle_d).list_b_length; i++) {
+					if (WP(w,buildvehicle_d).sel_engine != WP(w, buildvehicle_d).list_b[i]) continue;
 					found = true;
 					break;
 				}
 			}
-			if (!found) WP(w,buildtrain_d).sel_engine = INVALID_ENGINE;
+			if (!found) WP(w,buildvehicle_d).sel_engine = INVALID_ENGINE;
 		}
 	}
 
-	if (HASBIT(WP(w,buildtrain_d).show_engine_button, 0)) scrollcount += WP(w, buildtrain_d).list_a_length;
-	if (HASBIT(WP(w,buildtrain_d).show_engine_button, 1)) scrollcount += WP(w, buildtrain_d).list_b_length;
+	if (HASBIT(WP(w,buildvehicle_d).show_engine_button, 0)) scrollcount += WP(w, buildvehicle_d).list_a_length;
+	if (HASBIT(WP(w,buildvehicle_d).show_engine_button, 1)) scrollcount += WP(w, buildvehicle_d).list_b_length;
 
 	SetVScrollCount(w, scrollcount);
-	SetDParam(0, WP(w,buildtrain_d).railtype + STR_881C_NEW_RAIL_VEHICLES);
+	SetDParam(0, WP(w,buildvehicle_d).railtype + STR_881C_NEW_RAIL_VEHICLES);
 	DrawWindowWidgets(w);
 
 	if (selected_id == INVALID_ENGINE && scrollcount != 0) {
-		if (HASBIT(WP(w,buildtrain_d).show_engine_button, 0) && WP(w, buildtrain_d).list_a_length != 0) {
-			selected_id = WP(w, buildtrain_d).list_a[0];
+		if (HASBIT(WP(w,buildvehicle_d).show_engine_button, 0) && WP(w, buildvehicle_d).list_a_length != 0) {
+			selected_id = WP(w, buildvehicle_d).list_a[0];
 		} else {
-			selected_id = WP(w, buildtrain_d).list_b[0];
+			selected_id = WP(w, buildvehicle_d).list_b[0];
 		}
-		WP(w,buildtrain_d).sel_engine = selected_id;
+		WP(w,buildvehicle_d).sel_engine = selected_id;
 	}
 
 	/* Draw the engines */
-	if (HASBIT(WP(w,buildtrain_d).show_engine_button, 0)) {
-		engine_drawing_loop(WP(w, buildtrain_d).list_a, WP(w, buildtrain_d).list_a_length, x, &y, selected_id, &position, max);
+	if (HASBIT(WP(w,buildvehicle_d).show_engine_button, 0)) {
+		engine_drawing_loop(WP(w, buildvehicle_d).list_a, WP(w, buildvehicle_d).list_a_length, x, &y, selected_id, &position, max);
 
 		/* Magically set the number 0 line to the one right after the last engine
 		* This way the line numbers fit the indexes in the wagon array */
-		position -= WP(w, buildtrain_d).list_a_length;
-		max      -= WP(w, buildtrain_d).list_a_length;
+		position -= WP(w, buildvehicle_d).list_a_length;
+		max      -= WP(w, buildvehicle_d).list_a_length;
 	}
 
 	/* Draw the wagons */
-	if (HASBIT(WP(w,buildtrain_d).show_engine_button, 1)) {
-		engine_drawing_loop(WP(w, buildtrain_d).list_b,  WP(w, buildtrain_d).list_b_length,  x, &y, selected_id, &position, max);
+	if (HASBIT(WP(w,buildvehicle_d).show_engine_button, 1)) {
+		engine_drawing_loop(WP(w, buildvehicle_d).list_b,  WP(w, buildvehicle_d).list_b_length,  x, &y, selected_id, &position, max);
 	}
 
 	if (selected_id != INVALID_ENGINE) {
@@ -526,32 +526,32 @@ static void DrawTrainBuildWindow(Window *w)
 			DrawTrainEnginePurchaseInfo(2, w->widget[BUILD_TRAIN_WIDGET_PANEL].top + 1, selected_id);
 		}
 	}
-	DrawString(85, 15, _engine_sort_listing[WP(w,buildtrain_d).sort_criteria], 0x10);
-	DoDrawString(WP(w,buildtrain_d).decenting_sort_order ? DOWNARROW : UPARROW, 69, 15, 0x10);
+	DrawString(85, 15, _engine_sort_listing[WP(w,buildvehicle_d).sort_criteria], 0x10);
+	DoDrawString(WP(w,buildvehicle_d).decenting_sort_order ? DOWNARROW : UPARROW, 69, 15, 0x10);
 }
 
 static void NewRailVehicleWndProc(Window *w, WindowEvent *e)
 {
 	switch (e->event) {
 		case WE_CREATE:
-			WP(w, buildtrain_d).list_a_length = 0;
-			WP(w, buildtrain_d).list_b_length = 0;
-			WP(w, buildtrain_d).list_a        = NULL;
-			WP(w, buildtrain_d).list_b        = NULL;
-			WP(w, buildtrain_d).show_engine_button   = 3;
-			WP(w, buildtrain_d).data_invalidated     = true;
-			WP(w, buildtrain_d).sel_engine           = INVALID_ENGINE;
-			WP(w, buildtrain_d).sort_criteria        = _last_sort_criteria;
-			WP(w, buildtrain_d).decenting_sort_order = _last_sort_order;
+			WP(w, buildvehicle_d).list_a_length = 0;
+			WP(w, buildvehicle_d).list_b_length = 0;
+			WP(w, buildvehicle_d).list_a        = NULL;
+			WP(w, buildvehicle_d).list_b        = NULL;
+			WP(w, buildvehicle_d).show_engine_button   = 3;
+			WP(w, buildvehicle_d).data_invalidated     = true;
+			WP(w, buildvehicle_d).sel_engine           = INVALID_ENGINE;
+			WP(w, buildvehicle_d).sort_criteria        = _last_sort_criteria;
+			WP(w, buildvehicle_d).decenting_sort_order = _last_sort_order;
 			break;
 
 		case WE_INVALIDATE_DATA:
-			WP(w,buildtrain_d).data_invalidated = true;
+			WP(w,buildvehicle_d).data_invalidated = true;
 			break;
 
 		case WE_DESTROY:
-			free((void*)WP(w, buildtrain_d).list_a);
-			free((void*)WP(w, buildtrain_d).list_b);
+			free((void*)WP(w, buildvehicle_d).list_a);
+			free((void*)WP(w, buildvehicle_d).list_b);
 			break;
 
 		case WE_PAINT:
@@ -562,23 +562,23 @@ static void NewRailVehicleWndProc(Window *w, WindowEvent *e)
 		case WE_CLICK: {
 			switch (e->we.click.widget) {
 				case BUILD_TRAIN_WIDGET_SORT_ASSENDING_DESENTING:
-					WP(w,buildtrain_d).decenting_sort_order = !WP(w,buildtrain_d).decenting_sort_order;
-					_last_sort_order = WP(w,buildtrain_d).decenting_sort_order;
+					WP(w,buildvehicle_d).decenting_sort_order = !WP(w,buildvehicle_d).decenting_sort_order;
+					_last_sort_order = WP(w,buildvehicle_d).decenting_sort_order;
 					SortTrainBuildList(w);
 					SetWindowDirty(w);
 					break;
 
 				case BUILD_TRAIN_WIDGET_SORT_TEXT: case BUILD_TRAIN_WIDGET_SORT_DROPDOWN:/* Select sorting criteria dropdown menu */
-					ShowDropDownMenu(w, _engine_sort_listing, WP(w,buildtrain_d).sort_criteria, BUILD_TRAIN_WIDGET_SORT_DROPDOWN, 0, 0);
+					ShowDropDownMenu(w, _engine_sort_listing, WP(w,buildvehicle_d).sort_criteria, BUILD_TRAIN_WIDGET_SORT_DROPDOWN, 0, 0);
 					return;
 
 				case BUILD_TRAIN_WIDGET_LIST: {
 					uint i = ((e->we.click.pt.y - 26) / 14) + w->vscroll.pos;
-					if (i < (uint)(WP(w, buildtrain_d).list_a_length + WP(w, buildtrain_d).list_b_length)) {
-						if (i < WP(w, buildtrain_d).list_a_length && HASBIT(WP(w,buildtrain_d).show_engine_button, 0)) {
-							WP(w,buildtrain_d).sel_engine = WP(w, buildtrain_d).list_a[i];
+					if (i < (uint)(WP(w, buildvehicle_d).list_a_length + WP(w, buildvehicle_d).list_b_length)) {
+						if (i < WP(w, buildvehicle_d).list_a_length && HASBIT(WP(w,buildvehicle_d).show_engine_button, 0)) {
+							WP(w,buildvehicle_d).sel_engine = WP(w, buildvehicle_d).list_a[i];
 						} else {
-							WP(w,buildtrain_d).sel_engine = WP(w, buildtrain_d).list_b[i - (HASBIT(WP(w,buildtrain_d).show_engine_button, 0) ? WP(w, buildtrain_d).list_a_length : 0)];
+							WP(w,buildvehicle_d).sel_engine = WP(w, buildvehicle_d).list_b[i - (HASBIT(WP(w,buildvehicle_d).show_engine_button, 0) ? WP(w, buildvehicle_d).list_a_length : 0)];
 						}
 						SetWindowDirty(w);
 					}
@@ -593,24 +593,24 @@ static void NewRailVehicleWndProc(Window *w, WindowEvent *e)
 					 * Those numbers are the same as the clicked button - BUILD_TRAIN_WIDGET_ENGINES + 1 */
 
 					byte click_state = e->we.click.widget - BUILD_TRAIN_WIDGET_ENGINES + 1;
-					if (WP(w,buildtrain_d).show_engine_button == click_state) break; // We clicked the pressed button
-					WP(w,buildtrain_d).sel_engine = INVALID_ENGINE;
-					WP(w,buildtrain_d).show_engine_button = click_state;
+					if (WP(w,buildvehicle_d).show_engine_button == click_state) break; // We clicked the pressed button
+					WP(w,buildvehicle_d).sel_engine = INVALID_ENGINE;
+					WP(w,buildvehicle_d).show_engine_button = click_state;
 					w->vscroll.pos = 0;
 					SetWindowDirty(w);
 					}
 					break;
 
 				case BUILD_TRAIN_WIDGET_BUILD: {
-					EngineID sel_eng = WP(w,buildtrain_d).sel_engine;
+					EngineID sel_eng = WP(w,buildvehicle_d).sel_engine;
 					if (sel_eng != INVALID_ENGINE)
 						DoCommandP(w->window_number, sel_eng, 0, (RailVehInfo(sel_eng)->flags & RVI_WAGON) ? CcBuildWagon : CcBuildLoco, CMD_BUILD_RAIL_VEHICLE | CMD_MSG(STR_882B_CAN_T_BUILD_RAILROAD_VEHICLE));
 				}	break;
 
 				case BUILD_TRAIN_WIDGET_RENAME: {
-					EngineID sel_eng = WP(w,buildtrain_d).sel_engine;
+					EngineID sel_eng = WP(w,buildvehicle_d).sel_engine;
 					if (sel_eng != INVALID_ENGINE) {
-						WP(w,buildtrain_d).rename_engine = sel_eng;
+						WP(w,buildvehicle_d).rename_engine = sel_eng;
 						ShowQueryString(GetCustomEngineName(sel_eng),
 										STR_886A_RENAME_TRAIN_VEHICLE_TYPE, 31, 160, w->window_class, w->window_number, CS_ALPHANUMERAL);
 					}
@@ -621,14 +621,14 @@ static void NewRailVehicleWndProc(Window *w, WindowEvent *e)
 		case WE_ON_EDIT_TEXT: {
 			if (e->we.edittext.str[0] != '\0') {
 				_cmd_text = e->we.edittext.str;
-				DoCommandP(0, WP(w,buildtrain_d).rename_engine, 0, NULL,
+				DoCommandP(0, WP(w,buildvehicle_d).rename_engine, 0, NULL,
 					CMD_RENAME_ENGINE | CMD_MSG(STR_886B_CAN_T_RENAME_TRAIN_VEHICLE));
 			}
 		} break;
 
 		case WE_DROPDOWN_SELECT: /* we have selected a dropdown item in the list */
-			if (WP(w,buildtrain_d).sort_criteria != e->we.dropdown.index) {
-				WP(w,buildtrain_d).sort_criteria = e->we.dropdown.index;
+			if (WP(w,buildvehicle_d).sort_criteria != e->we.dropdown.index) {
+				WP(w,buildvehicle_d).sort_criteria = e->we.dropdown.index;
 				_last_sort_criteria = e->we.dropdown.index;
 				SortTrainBuildList(w);
 			}
@@ -668,10 +668,10 @@ void ShowBuildTrainWindow(TileIndex tile)
 
 	if (tile != 0) {
 		w->caption_color = GetTileOwner(tile);
-		WP(w,buildtrain_d).railtype = GetRailType(tile);
+		WP(w,buildvehicle_d).railtype = GetRailType(tile);
 	} else {
 		w->caption_color = _local_player;
-		WP(w,buildtrain_d).railtype = GetBestRailtype(GetPlayer(_local_player));
+		WP(w,buildvehicle_d).railtype = GetBestRailtype(GetPlayer(_local_player));
 	}
 }
 
diff --git a/window.h b/window.h
index 6aa11a161..0f591f258 100644
--- a/window.h
+++ b/window.h
@@ -405,8 +405,8 @@ typedef struct {
 	uint16 list_a_length;
 	uint16 list_b_length;
 	uint16 list_c_length;
-} buildtrain_d;
-assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(buildtrain_d));
+} buildvehicle_d;
+assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(buildvehicle_d));
 
 typedef struct {
 	byte vehicletype;