cpp/openttd-patchpack/source Changeset - r9183:200d86a0cdf3

Changeset - r9183:200d86a0cdf3

Parent rev.

Child rev.

[Not reviewed]

master

0 3 0

rubidium - 16 years ago 2008-05-11 15:00:11
rubidium@openttd.org

(svn r13046) -Codechange: make classes of the VehicleListWindow and the VehicleGroupWindow.

3 files changed with 856 insertions and 887 deletions:

src/group_gui.cpp

508

533

src/vehicle_gui.cpp

345

349

src/vehicle_gui.h

0 comments (0 inline, 0 general)

src/group_gui.cpp

➞

Show inline comments

@@ @@ -30,16 +30,6 @@ @@
 typedef GUIList<const Group*> GUIGroupList;
 struct groupveh_d : vehiclelist_d {
 	GroupID group_sel;
 	VehicleID vehicle_sel;
 	GUIGroupList groups;
 };
 assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(groupveh_d));
 assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(vehiclelist_d));
 static void BuildGroupList(GUIGroupList *gl, PlayerID owner, VehicleType vehicle_type)
+{
 	uint n = 0;
@@ @@ -132,6 +122,35 @@ enum GroupListWidgets { @@
 	GRP_WIDGET_RESIZE,
 };
 enum GroupActionListFunction {
 	GALF_REPLACE,
 	GALF_SERVICE,
 	GALF_DEPOT,
 	GALF_ADD_SHARED,
 	GALF_REMOVE_ALL,
 };
 /**
  * Update/redraw the group action dropdown
  * @param w   the window the dropdown belongs to
  * @param gid the currently selected group in the window
  */
 static void ShowGroupActionDropdown(Window *w, GroupID gid)
+{
 	DropDownList *list = new DropDownList();
 	list->push_back(new DropDownListStringItem(STR_REPLACE_VEHICLES,    GALF_REPLACE, false));
 	list->push_back(new DropDownListStringItem(STR_SEND_FOR_SERVICING,  GALF_SERVICE, false));
 	list->push_back(new DropDownListStringItem(STR_SEND_TRAIN_TO_DEPOT, GALF_DEPOT,   false));
 	if (IsValidGroupID(gid)) {
 		list->push_back(new DropDownListStringItem(STR_GROUP_ADD_SHARED_VEHICLE,  GALF_ADD_SHARED, false));
 		list->push_back(new DropDownListStringItem(STR_GROUP_REMOVE_ALL_VEHICLES, GALF_REMOVE_ALL, false));
+	}
 	ShowDropDownList(w, list, 0, GRP_WIDGET_MANAGE_VEHICLES_DROPDOWN);
+}
 static const Widget _group_widgets[] = {
 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,             STR_018B_CLOSE_WINDOW},
@@ @@ -163,617 +182,575 @@ static const Widget _group_widgets[] = { @@
 };
 static void CreateVehicleGroupWindow(Window *w)
+{
 	const PlayerID owner = (PlayerID)GB(w->window_number, 0, 8);
 	groupveh_d     *gv = &WP(w, groupveh_d);
 	GUIVehicleList *vl = &gv->vehicles;
 	GUIGroupList   *gl = &gv->groups;
 struct VehicleGroupWindow : public Window, public VehicleListBase {
 	GroupID group_sel;
 	VehicleID vehicle_sel;
 	GUIGroupList groups;
 	VehicleGroupWindow(const WindowDesc *desc, WindowNumber window_number) : Window(desc, NULL, window_number)
+	{
 		const PlayerID owner = (PlayerID)GB(this->window_number, 0, 8);
 		this->caption_color = owner;
 		this->hscroll.cap = 224;
 		this->resize.step_width = 1;
 	w->caption_color = owner;
 	w->hscroll.cap = 224;
 	w->resize.step_width = 1;
 		switch (this->vehicle_type) {
 			default: NOT_REACHED();
 			case VEH_TRAIN:
 			case VEH_ROAD:
 				this->vscroll.cap = 9;
 				this->vscroll2.cap = 6;
 				this->resize.step_height = PLY_WND_PRC__SIZE_OF_ROW_SMALL;
 				break;
 			case VEH_SHIP:
 			case VEH_AIRCRAFT:
 				this->vscroll.cap = 9;
 				this->vscroll2.cap = 4;
 				this->resize.step_height = PLY_WND_PRC__SIZE_OF_ROW_BIG2;
 				break;
+		}
 		this->widget[GRP_WIDGET_LIST_GROUP].data = (this->vscroll.cap << 8) + 1;
 		this->widget[GRP_WIDGET_LIST_VEHICLE].data = (this->vscroll2.cap << 8) + 1;
 		switch (this->vehicle_type) {
 			default: NOT_REACHED();
 			case VEH_TRAIN:    this->sorting = &_sorting.train;    break;
 			case VEH_ROAD:     this->sorting = &_sorting.roadveh;  break;
 			case VEH_SHIP:     this->sorting = &_sorting.ship;     break;
 			case VEH_AIRCRAFT: this->sorting = &_sorting.aircraft; break;
+		}
 		this->vehicle_type = (VehicleType)GB(this->window_number, 11, 5);
 		this->vehicles.sort_list = NULL;
 		this->vehicles.sort_type = this->sorting->criteria;
 		this->vehicles.flags = VL_REBUILD | (this->sorting->order ? VL_DESC : VL_NONE);
 		this->vehicles.resort_timer = DAY_TICKS * PERIODIC_RESORT_DAYS; // Set up resort timer
 	switch (gv->vehicle_type) {
 		default: NOT_REACHED();
 		case VEH_TRAIN:
 		case VEH_ROAD:
 			w->vscroll.cap = 9;
 			w->vscroll2.cap = 6;
 			w->resize.step_height = PLY_WND_PRC__SIZE_OF_ROW_SMALL;
 			break;
 		case VEH_SHIP:
 		case VEH_AIRCRAFT:
 			w->vscroll.cap = 9;
 			w->vscroll2.cap = 4;
 			w->resize.step_height = PLY_WND_PRC__SIZE_OF_ROW_BIG2;
 			break;
+	}
 		this->groups.sort_list = NULL;
 		this->groups.flags = VL_REBUILD | VL_NONE;
 		this->groups.resort_timer = DAY_TICKS * PERIODIC_RESORT_DAYS; // Set up resort timer
 		this->group_sel = ALL_GROUP;
 		this->vehicle_sel = INVALID_VEHICLE;
 		switch (this->vehicle_type) {
 			case VEH_TRAIN:
 				this->widget[GRP_WIDGET_LIST_VEHICLE].tooltips = STR_883D_TRAINS_CLICK_ON_TRAIN_FOR;
 				this->widget[GRP_WIDGET_AVAILABLE_VEHICLES].data = STR_AVAILABLE_TRAINS;
 				this->widget[GRP_WIDGET_CREATE_GROUP].data = SPR_GROUP_CREATE_TRAIN;
 				this->widget[GRP_WIDGET_RENAME_GROUP].data = SPR_GROUP_RENAME_TRAIN;
 				this->widget[GRP_WIDGET_DELETE_GROUP].data = SPR_GROUP_DELETE_TRAIN;
 				break;
 			case VEH_ROAD:
 				this->widget[GRP_WIDGET_LIST_VEHICLE].tooltips = STR_901A_ROAD_VEHICLES_CLICK_ON;
 				this->widget[GRP_WIDGET_AVAILABLE_VEHICLES].data = STR_AVAILABLE_ROAD_VEHICLES;
 	w->widget[GRP_WIDGET_LIST_GROUP].data = (w->vscroll.cap << 8) + 1;
 	w->widget[GRP_WIDGET_LIST_VEHICLE].data = (w->vscroll2.cap << 8) + 1;
 				this->widget[GRP_WIDGET_CREATE_GROUP].data = SPR_GROUP_CREATE_ROADVEH;
 				this->widget[GRP_WIDGET_RENAME_GROUP].data = SPR_GROUP_RENAME_ROADVEH;
 				this->widget[GRP_WIDGET_DELETE_GROUP].data = SPR_GROUP_DELETE_ROADVEH;
 				break;
 			case VEH_SHIP:
 				this->widget[GRP_WIDGET_LIST_VEHICLE].tooltips = STR_9823_SHIPS_CLICK_ON_SHIP_FOR;
 				this->widget[GRP_WIDGET_AVAILABLE_VEHICLES].data = STR_AVAILABLE_SHIPS;
 				this->widget[GRP_WIDGET_CREATE_GROUP].data = SPR_GROUP_CREATE_SHIP;
 				this->widget[GRP_WIDGET_RENAME_GROUP].data = SPR_GROUP_RENAME_SHIP;
 				this->widget[GRP_WIDGET_DELETE_GROUP].data = SPR_GROUP_DELETE_SHIP;
 				break;
 	switch (gv->vehicle_type) {
 		default: NOT_REACHED();
 		case VEH_TRAIN:    gv->sorting = &_sorting.train;    break;
 		case VEH_ROAD:     gv->sorting = &_sorting.roadveh;  break;
 		case VEH_SHIP:     gv->sorting = &_sorting.ship;     break;
 		case VEH_AIRCRAFT: gv->sorting = &_sorting.aircraft; break;
 			case VEH_AIRCRAFT:
 				this->widget[GRP_WIDGET_LIST_VEHICLE].tooltips = STR_A01F_AIRCRAFT_CLICK_ON_AIRCRAFT;
 				this->widget[GRP_WIDGET_AVAILABLE_VEHICLES].data = STR_AVAILABLE_AIRCRAFT;
 				this->widget[GRP_WIDGET_CREATE_GROUP].data = SPR_GROUP_CREATE_AIRCRAFT;
 				this->widget[GRP_WIDGET_RENAME_GROUP].data = SPR_GROUP_RENAME_AIRCRAFT;
 				this->widget[GRP_WIDGET_DELETE_GROUP].data = SPR_GROUP_DELETE_AIRCRAFT;
 				break;
 			default: NOT_REACHED();
+		}
 		this->FindWindowPlacementAndResize(desc);
+	}
 	gv->vehicle_type = (VehicleType)GB(w->window_number, 11, 5);
 	vl->sort_list = NULL;
 	vl->sort_type = gv->sorting->criteria;
 	vl->flags = VL_REBUILD | (gv->sorting->order ? VL_DESC : VL_NONE);
 	vl->resort_timer = DAY_TICKS * PERIODIC_RESORT_DAYS; // Set up resort timer
 	gl->sort_list = NULL;
 	gl->flags = VL_REBUILD | VL_NONE;
 	gl->resort_timer = DAY_TICKS * PERIODIC_RESORT_DAYS; // Set up resort timer
 	gv->group_sel = ALL_GROUP;
 	gv->vehicle_sel = INVALID_VEHICLE;
 	switch (gv->vehicle_type) {
 		case VEH_TRAIN:
 			w->widget[GRP_WIDGET_LIST_VEHICLE].tooltips = STR_883D_TRAINS_CLICK_ON_TRAIN_FOR;
 			w->widget[GRP_WIDGET_AVAILABLE_VEHICLES].data = STR_AVAILABLE_TRAINS;
 			w->widget[GRP_WIDGET_CREATE_GROUP].data = SPR_GROUP_CREATE_TRAIN;
 			w->widget[GRP_WIDGET_RENAME_GROUP].data = SPR_GROUP_RENAME_TRAIN;
 			w->widget[GRP_WIDGET_DELETE_GROUP].data = SPR_GROUP_DELETE_TRAIN;
 			break;
 		case VEH_ROAD:
 			w->widget[GRP_WIDGET_LIST_VEHICLE].tooltips = STR_901A_ROAD_VEHICLES_CLICK_ON;
 			w->widget[GRP_WIDGET_AVAILABLE_VEHICLES].data = STR_AVAILABLE_ROAD_VEHICLES;
 			w->widget[GRP_WIDGET_CREATE_GROUP].data = SPR_GROUP_CREATE_ROADVEH;
 			w->widget[GRP_WIDGET_RENAME_GROUP].data = SPR_GROUP_RENAME_ROADVEH;
 			w->widget[GRP_WIDGET_DELETE_GROUP].data = SPR_GROUP_DELETE_ROADVEH;
 			break;
 		case VEH_SHIP:
 			w->widget[GRP_WIDGET_LIST_VEHICLE].tooltips = STR_9823_SHIPS_CLICK_ON_SHIP_FOR;
 			w->widget[GRP_WIDGET_AVAILABLE_VEHICLES].data = STR_AVAILABLE_SHIPS;
 			w->widget[GRP_WIDGET_CREATE_GROUP].data = SPR_GROUP_CREATE_SHIP;
 			w->widget[GRP_WIDGET_RENAME_GROUP].data = SPR_GROUP_RENAME_SHIP;
 			w->widget[GRP_WIDGET_DELETE_GROUP].data = SPR_GROUP_DELETE_SHIP;
 			break;
 		case VEH_AIRCRAFT:
 			w->widget[GRP_WIDGET_LIST_VEHICLE].tooltips = STR_A01F_AIRCRAFT_CLICK_ON_AIRCRAFT;
 			w->widget[GRP_WIDGET_AVAILABLE_VEHICLES].data = STR_AVAILABLE_AIRCRAFT;
 			w->widget[GRP_WIDGET_CREATE_GROUP].data = SPR_GROUP_CREATE_AIRCRAFT;
 			w->widget[GRP_WIDGET_RENAME_GROUP].data = SPR_GROUP_RENAME_AIRCRAFT;
 			w->widget[GRP_WIDGET_DELETE_GROUP].data = SPR_GROUP_DELETE_AIRCRAFT;
 			break;
 		default: NOT_REACHED();
+	}
+}
 enum GroupActionListFunction {
 	GALF_REPLACE,
 	GALF_SERVICE,
 	GALF_DEPOT,
 	GALF_ADD_SHARED,
 	GALF_REMOVE_ALL,
 };
 /**
  * Update/redraw the group action dropdown
  * @param w   the window the dropdown belongs to
  * @param gid the currently selected group in the window
  */
 static void ShowGroupActionDropdown(Window *w, GroupID gid)
+{
 	DropDownList *list = new DropDownList();
 	list->push_back(new DropDownListStringItem(STR_REPLACE_VEHICLES,    GALF_REPLACE, false));
 	list->push_back(new DropDownListStringItem(STR_SEND_FOR_SERVICING,  GALF_SERVICE, false));
 	list->push_back(new DropDownListStringItem(STR_SEND_TRAIN_TO_DEPOT, GALF_DEPOT,   false));
 	if (IsValidGroupID(gid)) {
 		list->push_back(new DropDownListStringItem(STR_GROUP_ADD_SHARED_VEHICLE,  GALF_ADD_SHARED, false));
 		list->push_back(new DropDownListStringItem(STR_GROUP_REMOVE_ALL_VEHICLES, GALF_REMOVE_ALL, false));
 	~VehicleGroupWindow()
+	{
 		free((void*)this->vehicles.sort_list);
 		free((void*)this->groups.sort_list);
+	}
 	ShowDropDownList(w, list, 0, GRP_WIDGET_MANAGE_VEHICLES_DROPDOWN);
+}
 /**
  * bitmask for w->window_number
  * 0-7   PlayerID (owner)
  * 11-15 vehicle type
  **/
 static void GroupWndProc(Window *w, WindowEvent *e)
+{
 	const PlayerID owner = (PlayerID)GB(w->window_number, 0, 8);
 	groupveh_d     *gv = &WP(w, groupveh_d);
 	GUIVehicleList *vl = &gv->vehicles;
 	GUIGroupList   *gl = &gv->groups;
 	gv->vehicle_type = (VehicleType)GB(w->window_number, 11, 5);
 	virtual void OnInvalidateData(int data)
+	{
 		this->vehicles.flags |= VL_REBUILD;
 		this->groups.flags |= VL_REBUILD;
 		if (!(IsAllGroupID(this->group_sel) || IsDefaultGroupID(this->group_sel) || IsValidGroupID(this->group_sel))) {
 			this->group_sel = ALL_GROUP;
 			HideDropDownMenu(this);
+		}
 		this->SetDirty();
+	}
 	switch(e->event) {
 		case WE_INVALIDATE_DATA:
 			vl->flags |= VL_REBUILD;
 			gl->flags |= VL_REBUILD;
 			if (!(IsAllGroupID(gv->group_sel) || IsDefaultGroupID(gv->group_sel) || IsValidGroupID(gv->group_sel))) {
 				gv->group_sel = ALL_GROUP;
 				HideDropDownMenu(w);
+			}
 			w->SetDirty();
 			break;
 	virtual void OnPaint()
+	{
 		const PlayerID owner = (PlayerID)GB(this->window_number, 0, 8);
 		int x = 203;
 		int y2 = PLY_WND_PRC__OFFSET_TOP_WIDGET;
 		int y1 = PLY_WND_PRC__OFFSET_TOP_WIDGET + 2;
 		int max;
 		int i;
 		case WE_CREATE:
 			CreateVehicleGroupWindow(w);
 			break;
 		case WE_PAINT: {
 			int x = 203;
 			int y2 = PLY_WND_PRC__OFFSET_TOP_WIDGET;
 			int y1 = PLY_WND_PRC__OFFSET_TOP_WIDGET + 2;
 			int max;
 			int i;
 			/* If we select the all vehicles, gv->list will contain all vehicles of the player
 			 * else gv->list will contain all vehicles which belong to the selected group */
 			BuildVehicleList(gv, owner, gv->group_sel, IsAllGroupID(gv->group_sel) ? VLW_STANDARD : VLW_GROUP_LIST);
 			SortVehicleList(gv);
 		/* If we select the all vehicles, this->list will contain all vehicles of the player
 			* else this->list will contain all vehicles which belong to the selected group */
 		BuildVehicleList(this, owner, this->group_sel, IsAllGroupID(this->group_sel) ? VLW_STANDARD : VLW_GROUP_LIST);
 		SortVehicleList(this);
 			BuildGroupList(gl, owner, gv->vehicle_type);
 			SortGroupList(gl);
 		BuildGroupList(&this->groups, owner, this->vehicle_type);
 		SortGroupList(&this->groups);
 			SetVScrollCount(w, gl->list_length);
 			SetVScroll2Count(w, vl->list_length);
 		SetVScrollCount(this, this->groups.list_length);
 		SetVScroll2Count(this, this->vehicles.list_length);
 			/* The drop down menu is out, *but* it may not be used, retract it. */
 			if (vl->list_length == 0 && w->IsWidgetLowered(GRP_WIDGET_MANAGE_VEHICLES_DROPDOWN)) {
 				w->RaiseWidget(GRP_WIDGET_MANAGE_VEHICLES_DROPDOWN);
 				HideDropDownMenu(w);
+			}
 		/* The drop down menu is out, *but* it may not be used, retract it. */
 		if (this->vehicles.list_length == 0 && this->IsWidgetLowered(GRP_WIDGET_MANAGE_VEHICLES_DROPDOWN)) {
 			this->RaiseWidget(GRP_WIDGET_MANAGE_VEHICLES_DROPDOWN);
 			HideDropDownMenu(this);
+		}
 			/* Disable all lists management button when the list is empty */
 			w->SetWidgetsDisabledState(vl->list_length == 0 || _local_player != owner,
 					GRP_WIDGET_STOP_ALL,
 					GRP_WIDGET_START_ALL,
 					GRP_WIDGET_MANAGE_VEHICLES_DROPDOWN,
 					WIDGET_LIST_END);
 		/* Disable all lists management button when the list is empty */
 		this->SetWidgetsDisabledState(this->vehicles.list_length == 0 || _local_player != owner,
 				GRP_WIDGET_STOP_ALL,
 				GRP_WIDGET_START_ALL,
 				GRP_WIDGET_MANAGE_VEHICLES_DROPDOWN,
 				WIDGET_LIST_END);
 			/* Disable the group specific function when we select the default group or all vehicles */
 			w->SetWidgetsDisabledState(IsDefaultGroupID(gv->group_sel) || IsAllGroupID(gv->group_sel) || _local_player != owner,
 					GRP_WIDGET_DELETE_GROUP,
 					GRP_WIDGET_RENAME_GROUP,
 					GRP_WIDGET_REPLACE_PROTECTION,
 					WIDGET_LIST_END);
 		/* Disable the group specific function when we select the default group or all vehicles */
 		this->SetWidgetsDisabledState(IsDefaultGroupID(this->group_sel) || IsAllGroupID(this->group_sel) || _local_player != owner,
 				GRP_WIDGET_DELETE_GROUP,
 				GRP_WIDGET_RENAME_GROUP,
 				GRP_WIDGET_REPLACE_PROTECTION,
 				WIDGET_LIST_END);
 			/* Disable remaining buttons for non-local player
 			 * Needed while changing _local_player, eg. by cheats
 			 * All procedures (eg. move vehicle to another group)
 			 *  verify, whether you are the owner of the vehicle,
 			 *  so it doesn't have to be disabled
 			 */
 			w->SetWidgetsDisabledState(_local_player != owner,
 					GRP_WIDGET_CREATE_GROUP,
 					GRP_WIDGET_AVAILABLE_VEHICLES,
 					WIDGET_LIST_END);
 		/* Disable remaining buttons for non-local player
 			* Needed while changing _local_player, eg. by cheats
 			* All procedures (eg. move vehicle to another group)
 			*  verify, whether you are the owner of the vehicle,
 			*  so it doesn't have to be disabled
 			*/
 		this->SetWidgetsDisabledState(_local_player != owner,
 				GRP_WIDGET_CREATE_GROUP,
 				GRP_WIDGET_AVAILABLE_VEHICLES,
 				WIDGET_LIST_END);
 			/* If selected_group == DEFAULT_GROUP || ALL_GROUP, draw the standard caption
 			   We list all vehicles or ungrouped vehicles */
 			if (IsDefaultGroupID(gv->group_sel) || IsAllGroupID(gv->group_sel)) {
 				SetDParam(0, owner);
 				SetDParam(1, vl->list_length);
 				switch (gv->vehicle_type) {
 					case VEH_TRAIN:
 						w->widget[GRP_WIDGET_CAPTION].data = STR_881B_TRAINS;
 						w->widget[GRP_WIDGET_REPLACE_PROTECTION].data = SPR_GROUP_REPLACE_OFF_TRAIN;
 						break;
 					case VEH_ROAD:
 						w->widget[GRP_WIDGET_CAPTION].data = STR_9001_ROAD_VEHICLES;
 						w->widget[GRP_WIDGET_REPLACE_PROTECTION].data = SPR_GROUP_REPLACE_OFF_ROADVEH;
 						break;
 					case VEH_SHIP:
 						w->widget[GRP_WIDGET_CAPTION].data = STR_9805_SHIPS;
 						w->widget[GRP_WIDGET_REPLACE_PROTECTION].data = SPR_GROUP_REPLACE_OFF_SHIP;
 						break;
 					case VEH_AIRCRAFT:
 						w->widget[GRP_WIDGET_CAPTION].data =  STR_A009_AIRCRAFT;
 						w->widget[GRP_WIDGET_REPLACE_PROTECTION].data = SPR_GROUP_REPLACE_OFF_AIRCRAFT;
 						break;
 					default: NOT_REACHED();
+				}
 			} else {
 				const Group *g = GetGroup(gv->group_sel);
 				SetDParam(0, g->index);
 				SetDParam(1, g->num_vehicle);
 		/* If selected_group == DEFAULT_GROUP || ALL_GROUP, draw the standard caption
 				We list all vehicles or ungrouped vehicles */
 		if (IsDefaultGroupID(this->group_sel) || IsAllGroupID(this->group_sel)) {
 			SetDParam(0, owner);
 			SetDParam(1, this->vehicles.list_length);
 				switch (gv->vehicle_type) {
 					case VEH_TRAIN:
 						w->widget[GRP_WIDGET_CAPTION].data = STR_GROUP_TRAINS_CAPTION;
 						w->widget[GRP_WIDGET_REPLACE_PROTECTION].data = (g->replace_protection) ? SPR_GROUP_REPLACE_ON_TRAIN : SPR_GROUP_REPLACE_OFF_TRAIN;
 						break;
 					case VEH_ROAD:
 						w->widget[GRP_WIDGET_CAPTION].data = STR_GROUP_ROADVEH_CAPTION;
 						w->widget[GRP_WIDGET_REPLACE_PROTECTION].data = (g->replace_protection) ? SPR_GROUP_REPLACE_ON_ROADVEH : SPR_GROUP_REPLACE_OFF_ROADVEH;
 						break;
 					case VEH_SHIP:
 						w->widget[GRP_WIDGET_CAPTION].data = STR_GROUP_SHIPS_CAPTION;
 						w->widget[GRP_WIDGET_REPLACE_PROTECTION].data = (g->replace_protection) ? SPR_GROUP_REPLACE_ON_SHIP : SPR_GROUP_REPLACE_OFF_SHIP;
 						break;
 					case VEH_AIRCRAFT:
 						w->widget[GRP_WIDGET_CAPTION].data = STR_GROUP_AIRCRAFTS_CAPTION;
 						w->widget[GRP_WIDGET_REPLACE_PROTECTION].data = (g->replace_protection) ? SPR_GROUP_REPLACE_ON_AIRCRAFT : SPR_GROUP_REPLACE_OFF_AIRCRAFT;
 						break;
 					default: NOT_REACHED();
+				}
+			}
 			/* Set text of sort by dropdown */
 			w->widget[GRP_WIDGET_SORT_BY_DROPDOWN].data = _vehicle_sort_listing[vl->sort_type];
 			DrawWindowWidgets(w);
 			/* Draw Matrix Group
 			 * The selected group is drawn in white */
 			StringID str_all_veh, str_no_group_veh;
 			switch (gv->vehicle_type) {
 			switch (this->vehicle_type) {
 				case VEH_TRAIN:
 					str_all_veh = STR_GROUP_ALL_TRAINS;
 					str_no_group_veh = STR_GROUP_DEFAULT_TRAINS;
 					this->widget[GRP_WIDGET_CAPTION].data = STR_881B_TRAINS;
 					this->widget[GRP_WIDGET_REPLACE_PROTECTION].data = SPR_GROUP_REPLACE_OFF_TRAIN;
 					break;
 				case VEH_ROAD:
 					str_all_veh = STR_GROUP_ALL_ROADS;
 					str_no_group_veh = STR_GROUP_DEFAULT_ROADS;
 					this->widget[GRP_WIDGET_CAPTION].data = STR_9001_ROAD_VEHICLES;
 					this->widget[GRP_WIDGET_REPLACE_PROTECTION].data = SPR_GROUP_REPLACE_OFF_ROADVEH;
 					break;
 				case VEH_SHIP:
 					str_all_veh = STR_GROUP_ALL_SHIPS;
 					str_no_group_veh = STR_GROUP_DEFAULT_SHIPS;
 					this->widget[GRP_WIDGET_CAPTION].data = STR_9805_SHIPS;
 					this->widget[GRP_WIDGET_REPLACE_PROTECTION].data = SPR_GROUP_REPLACE_OFF_SHIP;
 					break;
 				case VEH_AIRCRAFT:
 					str_all_veh = STR_GROUP_ALL_AIRCRAFTS;
 					str_no_group_veh = STR_GROUP_DEFAULT_AIRCRAFTS;
 					this->widget[GRP_WIDGET_CAPTION].data =  STR_A009_AIRCRAFT;
 					this->widget[GRP_WIDGET_REPLACE_PROTECTION].data = SPR_GROUP_REPLACE_OFF_AIRCRAFT;
 					break;
 				default: NOT_REACHED();
+			}
 		} else {
 			const Group *g = GetGroup(this->group_sel);
 			SetDParam(0, g->index);
 			SetDParam(1, g->num_vehicle);
 			switch (this->vehicle_type) {
 				case VEH_TRAIN:
 					this->widget[GRP_WIDGET_CAPTION].data = STR_GROUP_TRAINS_CAPTION;
 					this->widget[GRP_WIDGET_REPLACE_PROTECTION].data = (g->replace_protection) ? SPR_GROUP_REPLACE_ON_TRAIN : SPR_GROUP_REPLACE_OFF_TRAIN;
 					break;
 				case VEH_ROAD:
 					this->widget[GRP_WIDGET_CAPTION].data = STR_GROUP_ROADVEH_CAPTION;
 					this->widget[GRP_WIDGET_REPLACE_PROTECTION].data = (g->replace_protection) ? SPR_GROUP_REPLACE_ON_ROADVEH : SPR_GROUP_REPLACE_OFF_ROADVEH;
 					break;
 				case VEH_SHIP:
 					this->widget[GRP_WIDGET_CAPTION].data = STR_GROUP_SHIPS_CAPTION;
 					this->widget[GRP_WIDGET_REPLACE_PROTECTION].data = (g->replace_protection) ? SPR_GROUP_REPLACE_ON_SHIP : SPR_GROUP_REPLACE_OFF_SHIP;
 					break;
 				case VEH_AIRCRAFT:
 					this->widget[GRP_WIDGET_CAPTION].data = STR_GROUP_AIRCRAFTS_CAPTION;
 					this->widget[GRP_WIDGET_REPLACE_PROTECTION].data = (g->replace_protection) ? SPR_GROUP_REPLACE_ON_AIRCRAFT : SPR_GROUP_REPLACE_OFF_AIRCRAFT;
 					break;
 				default: NOT_REACHED();
+			}
 			DrawString(10, y1, str_all_veh, IsAllGroupID(gv->group_sel) ? TC_WHITE : TC_BLACK);
 			y1 += 13;
 			DrawString(10, y1, str_no_group_veh, IsDefaultGroupID(gv->group_sel) ? TC_WHITE : TC_BLACK);
+		}
 			max = min(w->vscroll.pos + w->vscroll.cap, gl->list_length);
 			for (i = w->vscroll.pos ; i < max ; ++i) {
 				const Group *g = gl->sort_list[i];
 				assert(g->owner == owner);
 		/* Set text of sort by dropdown */
 		this->widget[GRP_WIDGET_SORT_BY_DROPDOWN].data = _vehicle_sort_listing[this->vehicles.sort_type];
 				y1 += PLY_WND_PRC__SIZE_OF_ROW_TINY;
 				/* draw the selected group in white, else we draw it in black */
 				SetDParam(0, g->index);
 				DrawString(10, y1, STR_GROUP_NAME, (gv->group_sel == g->index) ? TC_WHITE : TC_BLACK);
 		DrawWindowWidgets(this);
 				/* draw the number of vehicles of the group */
 				SetDParam(0, g->num_vehicle);
 				DrawStringRightAligned(187, y1 + 1, STR_GROUP_TINY_NUM, (gv->group_sel == g->index) ? TC_WHITE : TC_BLACK);
+			}
 			DrawSortButtonState(w, GRP_WIDGET_SORT_BY_ORDER, vl->flags & VL_DESC ? SBS_DOWN : SBS_UP);
 		/* Draw Matrix Group
 			* The selected group is drawn in white */
 		StringID str_all_veh, str_no_group_veh;
 			/* Draw Matrix Vehicle according to the vehicle list built before */
 			max = min(w->vscroll2.pos + w->vscroll2.cap, vl->list_length);
 			for (i = w->vscroll2.pos ; i < max ; ++i) {
 				const Vehicle* v = vl->sort_list[i];
 				assert(v->type == gv->vehicle_type && v->owner == owner);
 				DrawVehicleImage(v, x + 19, y2 + 6, gv->vehicle_sel, w->hscroll.cap, 0);
 				DrawVehicleProfitButton(v, x, y2 + 13);
 				SetDParam(0, v->unitnumber);
 				DrawString(x, y2 + 2, v->IsInDepot() ? STR_021F : (v->age > v->max_age - 366 ? STR_00E3 : STR_00E2), TC_FROMSTRING);
 		switch (this->vehicle_type) {
 			case VEH_TRAIN:
 				str_all_veh = STR_GROUP_ALL_TRAINS;
 				str_no_group_veh = STR_GROUP_DEFAULT_TRAINS;
 				break;
 			case VEH_ROAD:
 				str_all_veh = STR_GROUP_ALL_ROADS;
 				str_no_group_veh = STR_GROUP_DEFAULT_ROADS;
 				break;
 			case VEH_SHIP:
 				str_all_veh = STR_GROUP_ALL_SHIPS;
 				str_no_group_veh = STR_GROUP_DEFAULT_SHIPS;
 				break;
 			case VEH_AIRCRAFT:
 				str_all_veh = STR_GROUP_ALL_AIRCRAFTS;
 				str_no_group_veh = STR_GROUP_DEFAULT_AIRCRAFTS;
 				break;
 			default: NOT_REACHED();
+		}
 		DrawString(10, y1, str_all_veh, IsAllGroupID(this->group_sel) ? TC_WHITE : TC_BLACK);
 				if (w->resize.step_height == PLY_WND_PRC__SIZE_OF_ROW_BIG2) DrawSmallOrderList(v, x + 138, y2);
 		y1 += 13;
 		DrawString(10, y1, str_no_group_veh, IsDefaultGroupID(this->group_sel) ? TC_WHITE : TC_BLACK);
 				SetDParam(0, v->GetDisplayProfitThisYear());
 				SetDParam(1, v->GetDisplayProfitLastYear());
 				DrawString(x + 19, y2 + w->resize.step_height - 8, STR_0198_PROFIT_THIS_YEAR_LAST_YEAR, TC_FROMSTRING);
 		max = min(this->vscroll.pos + this->vscroll.cap, this->groups.list_length);
 		for (i = this->vscroll.pos ; i < max ; ++i) {
 			const Group *g = this->groups.sort_list[i];
 			assert(g->owner == owner);
 				if (IsValidGroupID(v->group_id)) {
 					SetDParam(0, v->group_id);
 					DrawString(x + 19, y2, STR_GROUP_TINY_NAME, TC_BLACK);
+				}
 			y1 += PLY_WND_PRC__SIZE_OF_ROW_TINY;
 				y2 += w->resize.step_height;
+			}
 			/* draw the selected group in white, else we draw it in black */
 			SetDParam(0, g->index);
 			DrawString(10, y1, STR_GROUP_NAME, (this->group_sel == g->index) ? TC_WHITE : TC_BLACK);
 			break;
 			/* draw the number of vehicles of the group */
 			SetDParam(0, g->num_vehicle);
 			DrawStringRightAligned(187, y1 + 1, STR_GROUP_TINY_NUM, (this->group_sel == g->index) ? TC_WHITE : TC_BLACK);
+		}
 		case WE_CLICK:
 			if (e->we.click.widget != GRP_WIDGET_SORT_BY_DROPDOWN && e->we.click.widget != GRP_WIDGET_MANAGE_VEHICLES_DROPDOWN) HideDropDownMenu(w);
 		DrawSortButtonState(this, GRP_WIDGET_SORT_BY_ORDER, this->vehicles.flags & VL_DESC ? SBS_DOWN : SBS_UP);
 		/* Draw Matrix Vehicle according to the vehicle list built before */
 		max = min(this->vscroll2.pos + this->vscroll2.cap, this->vehicles.list_length);
 		for (i = this->vscroll2.pos ; i < max ; ++i) {
 			const Vehicle* v = this->vehicles.sort_list[i];
 			assert(v->type == this->vehicle_type && v->owner == owner);
 			switch(e->we.click.widget) {
 				case GRP_WIDGET_SORT_BY_ORDER: // Flip sorting method ascending/descending
 					vl->flags ^= VL_DESC;
 					vl->flags |= VL_RESORT;
 			DrawVehicleImage(v, x + 19, y2 + 6, this->vehicle_sel, this->hscroll.cap, 0);
 			DrawVehicleProfitButton(v, x, y2 + 13);
 			SetDParam(0, v->unitnumber);
 			DrawString(x, y2 + 2, v->IsInDepot() ? STR_021F : (v->age > v->max_age - 366 ? STR_00E3 : STR_00E2), TC_FROMSTRING);
 			if (this->resize.step_height == PLY_WND_PRC__SIZE_OF_ROW_BIG2) DrawSmallOrderList(v, x + 138, y2);
 			SetDParam(0, v->GetDisplayProfitThisYear());
 			SetDParam(1, v->GetDisplayProfitLastYear());
 			DrawString(x + 19, y2 + this->resize.step_height - 8, STR_0198_PROFIT_THIS_YEAR_LAST_YEAR, TC_FROMSTRING);
 					gv->sorting->order = !!(vl->flags & VL_DESC);
 					w->SetDirty();
 					break;
 			if (IsValidGroupID(v->group_id)) {
 				SetDParam(0, v->group_id);
 				DrawString(x + 19, y2, STR_GROUP_TINY_NAME, TC_BLACK);
+			}
 			y2 += this->resize.step_height;
+		}
+	}
 	virtual void OnClick(Point pt, int widget)
+	{
 		if (widget != GRP_WIDGET_SORT_BY_DROPDOWN && widget != GRP_WIDGET_MANAGE_VEHICLES_DROPDOWN) HideDropDownMenu(this);
 				case GRP_WIDGET_SORT_BY_DROPDOWN: // Select sorting criteria dropdown menu
 					ShowDropDownMenu(w, _vehicle_sort_listing, vl->sort_type,  GRP_WIDGET_SORT_BY_DROPDOWN, 0, (gv->vehicle_type == VEH_TRAIN || gv->vehicle_type == VEH_ROAD) ? 0 : (1 << 10));
 					return;
 		switch(widget) {
 			case GRP_WIDGET_SORT_BY_ORDER: // Flip sorting method ascending/descending
 				this->vehicles.flags ^= VL_DESC;
 				this->vehicles.flags |= VL_RESORT;
 				this->sorting->order = !!(this->vehicles.flags & VL_DESC);
 				this->SetDirty();
 				break;
 			case GRP_WIDGET_SORT_BY_DROPDOWN: // Select sorting criteria dropdown menu
 				ShowDropDownMenu(this, _vehicle_sort_listing, this->vehicles.sort_type,  GRP_WIDGET_SORT_BY_DROPDOWN, 0, (this->vehicle_type == VEH_TRAIN || this->vehicle_type == VEH_ROAD) ? 0 : (1 << 10));
 				return;
 				case GRP_WIDGET_ALL_VEHICLES: // All vehicles button
 					if (!IsAllGroupID(gv->group_sel)) {
 						gv->group_sel = ALL_GROUP;
 						vl->flags |= VL_REBUILD;
 						w->SetDirty();
+					}
 					break;
 			case GRP_WIDGET_ALL_VEHICLES: // All vehicles button
 				if (!IsAllGroupID(this->group_sel)) {
 					this->group_sel = ALL_GROUP;
 					this->vehicles.flags |= VL_REBUILD;
 					this->SetDirty();
+				}
 				break;
 			case GRP_WIDGET_DEFAULT_VEHICLES: // Ungrouped vehicles button
 				if (!IsDefaultGroupID(this->group_sel)) {
 					this->group_sel = DEFAULT_GROUP;
 					this->vehicles.flags |= VL_REBUILD;
 					this->SetDirty();
+				}
 				break;
 			case GRP_WIDGET_LIST_GROUP: { // Matrix Group
 				uint16 id_g = (pt.y - PLY_WND_PRC__OFFSET_TOP_WIDGET - 26) / PLY_WND_PRC__SIZE_OF_ROW_TINY;
 				if (id_g >= this->vscroll.cap) return;
 				id_g += this->vscroll.pos;
 				if (id_g >= this->groups.list_length) return;
 				case GRP_WIDGET_DEFAULT_VEHICLES: // Ungrouped vehicles button
 					if (!IsDefaultGroupID(gv->group_sel)) {
 						gv->group_sel = DEFAULT_GROUP;
 						vl->flags |= VL_REBUILD;
 						w->SetDirty();
+					}
 					break;
 				this->group_sel = this->groups.sort_list[id_g]->index;;
 				case GRP_WIDGET_LIST_GROUP: { // Matrix Group
 					uint16 id_g = (e->we.click.pt.y - PLY_WND_PRC__OFFSET_TOP_WIDGET - 26) / PLY_WND_PRC__SIZE_OF_ROW_TINY;
 				this->vehicles.flags |= VL_REBUILD;
 				this->SetDirty();
 				break;
+			}
 			case GRP_WIDGET_LIST_VEHICLE: { // Matrix Vehicle
 				uint32 id_v = (pt.y - PLY_WND_PRC__OFFSET_TOP_WIDGET) / (int)this->resize.step_height;
 				const Vehicle *v;
-					if (id_g >= w->vscroll.cap) return;
+				if (id_v >= this->vscroll2.cap) return; // click out of bounds
-					id_g += w->vscroll.pos;
+				id_v += this->vscroll2.pos;
-					if (id_g >= gl->list_length) return;
+				if (id_v >= this->vehicles.list_length) return; // click out of list bound
 					gv->group_sel = gl->sort_list[id_g]->index;;
 				v = this->vehicles.sort_list[id_v];
 				this->vehicle_sel = v->index;
 					vl->flags |= VL_REBUILD;
 					w->SetDirty();
 					break;
 				if (v->IsValid()) {
 					SetObjectToPlaceWnd(v->GetImage(DIR_W), GetVehiclePalette(v), VHM_DRAG, this);
 					_cursor.vehchain = true;
+				}
 				case GRP_WIDGET_LIST_VEHICLE: { // Matrix Vehicle
 					uint32 id_v = (e->we.click.pt.y - PLY_WND_PRC__OFFSET_TOP_WIDGET) / (int)w->resize.step_height;
 					const Vehicle *v;
 					if (id_v >= w->vscroll2.cap) return; // click out of bounds
 					id_v += w->vscroll2.pos;
 				this->SetDirty();
 				break;
+			}
 					if (id_v >= vl->list_length) return; // click out of list bound
 					v = vl->sort_list[id_v];
 			case GRP_WIDGET_CREATE_GROUP: // Create a new group
 				DoCommandP(0, this->vehicle_type, 0, NULL, CMD_CREATE_GROUP | CMD_MSG(STR_GROUP_CAN_T_CREATE));
 				break;
 					gv->vehicle_sel = v->index;
 					if (v->IsValid()) {
 						SetObjectToPlaceWnd(v->GetImage(DIR_W), GetVehiclePalette(v), VHM_DRAG, w);
 						_cursor.vehchain = true;
+					}
 			case GRP_WIDGET_DELETE_GROUP: { // Delete the selected group
 				GroupID group = this->group_sel;
 				this->group_sel = ALL_GROUP;
 					w->SetDirty();
 					break;
+				}
 				case GRP_WIDGET_CREATE_GROUP: // Create a new group
 					DoCommandP(0, gv->vehicle_type, 0, NULL, CMD_CREATE_GROUP | CMD_MSG(STR_GROUP_CAN_T_CREATE));
 					break;
 				case GRP_WIDGET_DELETE_GROUP: { // Delete the selected group
 					GroupID group = gv->group_sel;
 					gv->group_sel = ALL_GROUP;
 				DoCommandP(0, group, 0, NULL, CMD_DELETE_GROUP | CMD_MSG(STR_GROUP_CAN_T_DELETE));
 				break;
+			}
 					DoCommandP(0, group, 0, NULL, CMD_DELETE_GROUP | CMD_MSG(STR_GROUP_CAN_T_DELETE));
 					break;
+				}
 			case GRP_WIDGET_RENAME_GROUP: { // Rename the selected roup
 				assert(IsValidGroupID(this->group_sel));
 				case GRP_WIDGET_RENAME_GROUP: { // Rename the selected roup
 					assert(IsValidGroupID(gv->group_sel));
 				const Group *g = GetGroup(this->group_sel);
 					const Group *g = GetGroup(gv->group_sel);
 					SetDParam(0, g->index);
 					ShowQueryString(STR_GROUP_NAME, STR_GROUP_RENAME_CAPTION, 31, 150, w, CS_ALPHANUMERAL);
 				} break;
 				SetDParam(0, g->index);
 				ShowQueryString(STR_GROUP_NAME, STR_GROUP_RENAME_CAPTION, 31, 150, this, CS_ALPHANUMERAL);
 			} break;
 				case GRP_WIDGET_AVAILABLE_VEHICLES:
 					ShowBuildVehicleWindow(0, gv->vehicle_type);
 					break;
 			case GRP_WIDGET_AVAILABLE_VEHICLES:
 				ShowBuildVehicleWindow(0, this->vehicle_type);
 				break;
 			case GRP_WIDGET_MANAGE_VEHICLES_DROPDOWN:
 				ShowGroupActionDropdown(this, this->group_sel);
 				break;
 				case GRP_WIDGET_MANAGE_VEHICLES_DROPDOWN:
 					ShowGroupActionDropdown(w, gv->group_sel);
 					break;
 			case GRP_WIDGET_START_ALL:
 			case GRP_WIDGET_STOP_ALL: { // Start/stop all vehicles of the list
 				DoCommandP(0, this->group_sel, ((IsAllGroupID(this->group_sel) ? VLW_STANDARD : VLW_GROUP_LIST) & VLW_MASK)
 													| (1 << 6)
 													| (widget == GRP_WIDGET_START_ALL ? (1 << 5) : 0)
 													| this->vehicle_type, NULL, CMD_MASS_START_STOP);
 				break;
+			}
 			case GRP_WIDGET_REPLACE_PROTECTION:
 				if (IsValidGroupID(this->group_sel)) {
 					const Group *g = GetGroup(this->group_sel);
 					DoCommandP(0, this->group_sel, !g->replace_protection, NULL, CMD_SET_GROUP_REPLACE_PROTECTION);
+				}
 				break;
+		}
+	}
 				case GRP_WIDGET_START_ALL:
 				case GRP_WIDGET_STOP_ALL: { // Start/stop all vehicles of the list
 					DoCommandP(0, gv->group_sel, ((IsAllGroupID(gv->group_sel) ? VLW_STANDARD : VLW_GROUP_LIST) & VLW_MASK)
 														| (1 << 6)
 														| (e->we.click.widget == GRP_WIDGET_START_ALL ? (1 << 5) : 0)
 														| gv->vehicle_type, NULL, CMD_MASS_START_STOP);
 	virtual void OnDragDrop(Point pt, int widget)
+	{
 		switch (widget) {
 			case GRP_WIDGET_ALL_VEHICLES: // All vehicles
 			case GRP_WIDGET_DEFAULT_VEHICLES: // Ungrouped vehicles
 				DoCommandP(0, DEFAULT_GROUP, this->vehicle_sel, NULL, CMD_ADD_VEHICLE_GROUP | CMD_MSG(STR_GROUP_CAN_T_ADD_VEHICLE));
 				this->vehicle_sel = INVALID_VEHICLE;
 				this->SetDirty();
 				break;
 					break;
+				}
 			case GRP_WIDGET_LIST_GROUP: { // Maxtrix group
 				uint16 id_g = (pt.y - PLY_WND_PRC__OFFSET_TOP_WIDGET - 26) / PLY_WND_PRC__SIZE_OF_ROW_TINY;
 				const VehicleID vindex = this->vehicle_sel;
 				this->vehicle_sel = INVALID_VEHICLE;
 				this->SetDirty();
 				case GRP_WIDGET_REPLACE_PROTECTION:
 					if (IsValidGroupID(gv->group_sel)) {
 						const Group *g = GetGroup(gv->group_sel);
 				if (id_g >= this->vscroll.cap) return;
 				id_g += this->vscroll.pos;
 						DoCommandP(0, gv->group_sel, !g->replace_protection, NULL, CMD_SET_GROUP_REPLACE_PROTECTION);
+					}
 					break;
 				if (id_g >= this->groups.list_length) return;
 				DoCommandP(0, this->groups.sort_list[id_g]->index, vindex, NULL, CMD_ADD_VEHICLE_GROUP | CMD_MSG(STR_GROUP_CAN_T_ADD_VEHICLE));
 				break;
+			}
 			break;
 			case GRP_WIDGET_LIST_VEHICLE: { // Maxtrix vehicle
 				uint32 id_v = (pt.y - PLY_WND_PRC__OFFSET_TOP_WIDGET) / (int)this->resize.step_height;
 				const Vehicle *v;
 				const VehicleID vindex = this->vehicle_sel;
 		case WE_DRAGDROP: {
 			switch (e->we.click.widget) {
 				case GRP_WIDGET_ALL_VEHICLES: // All vehicles
 				case GRP_WIDGET_DEFAULT_VEHICLES: // Ungrouped vehicles
 					DoCommandP(0, DEFAULT_GROUP, gv->vehicle_sel, NULL, CMD_ADD_VEHICLE_GROUP | CMD_MSG(STR_GROUP_CAN_T_ADD_VEHICLE));
 				this->vehicle_sel = INVALID_VEHICLE;
 					gv->vehicle_sel = INVALID_VEHICLE;
 					w->SetDirty();
 					break;
 				this->SetDirty();
 				case GRP_WIDGET_LIST_GROUP: { // Maxtrix group
 					uint16 id_g = (e->we.click.pt.y - PLY_WND_PRC__OFFSET_TOP_WIDGET - 26) / PLY_WND_PRC__SIZE_OF_ROW_TINY;
 					const VehicleID vindex = gv->vehicle_sel;
 				if (id_v >= this->vscroll2.cap) return; // click out of bounds
 					gv->vehicle_sel = INVALID_VEHICLE;
 					w->SetDirty();
 				id_v += this->vscroll2.pos;
 					if (id_g >= w->vscroll.cap) return;
 					id_g += w->vscroll.pos;
 				if (id_v >= this->vehicles.list_length) return; // click out of list bound
-					if (id_g >= gl->list_length) return;
+				v = this->vehicles.sort_list[id_v];
 					DoCommandP(0, gl->sort_list[id_g]->index, vindex, NULL, CMD_ADD_VEHICLE_GROUP | CMD_MSG(STR_GROUP_CAN_T_ADD_VEHICLE));
 					break;
 				if (vindex == v->index) {
 					ShowVehicleViewWindow(v);
+				}
 				case GRP_WIDGET_LIST_VEHICLE: { // Maxtrix vehicle
 					uint32 id_v = (e->we.click.pt.y - PLY_WND_PRC__OFFSET_TOP_WIDGET) / (int)w->resize.step_height;
 					const Vehicle *v;
 					const VehicleID vindex = gv->vehicle_sel;
 				break;
+			}
+		}
 		_cursor.vehchain = false;
+	}
 	virtual void OnQueryTextFinished(char *str)
+	{
 		if (!StrEmpty(str)) {
 			_cmd_text = str;
 					gv->vehicle_sel = INVALID_VEHICLE;
 					w->SetDirty();
 			DoCommandP(0, this->group_sel, 0, NULL, CMD_RENAME_GROUP | CMD_MSG(STR_GROUP_CAN_T_RENAME));
+		}
+	}
 					if (id_v >= w->vscroll2.cap) return; // click out of bounds
 	virtual void OnResize(Point new_size, Point delta)
+	{
 		this->hscroll.cap += delta.x;
 		this->vscroll.cap += delta.y / PLY_WND_PRC__SIZE_OF_ROW_TINY;
 		this->vscroll2.cap += delta.y / (int)this->resize.step_height;
 					id_v += w->vscroll2.pos;
 		this->widget[GRP_WIDGET_LIST_GROUP].data = (this->vscroll.cap << 8) + 1;
 		this->widget[GRP_WIDGET_LIST_VEHICLE].data = (this->vscroll2.cap << 8) + 1;
+	}
 					if (id_v >= vl->list_length) return; // click out of list bound
 	virtual void OnDropdownSelect(int widget, int index)
+	{
 		switch (widget) {
 			case GRP_WIDGET_SORT_BY_DROPDOWN:
 				if (this->vehicles.sort_type != index) {
 					this->vehicles.flags |= VL_RESORT;
 					this->vehicles.sort_type = index;
 					this->sorting->criteria = this->vehicles.sort_type;
+				}
 				break;
 					v = vl->sort_list[id_v];
 			case GRP_WIDGET_MANAGE_VEHICLES_DROPDOWN:
 				assert(this->vehicles.list_length != 0);
 					if (vindex == v->index) {
 						ShowVehicleViewWindow(v);
+					}
 				switch (index) {
 					case GALF_REPLACE: // Replace window
 						ShowReplaceGroupVehicleWindow(this->group_sel, this->vehicle_type);
 						break;
 					case GALF_SERVICE: // Send for servicing
 						DoCommandP(0, this->group_sel, ((IsAllGroupID(this->group_sel) ? VLW_STANDARD : VLW_GROUP_LIST) & VLW_MASK)
 									| DEPOT_MASS_SEND
 									| DEPOT_SERVICE, NULL, GetCmdSendToDepot(this->vehicle_type));
 						break;
 					case GALF_DEPOT: // Send to Depots
 						DoCommandP(0, this->group_sel, ((IsAllGroupID(this->group_sel) ? VLW_STANDARD : VLW_GROUP_LIST) & VLW_MASK)
 									| DEPOT_MASS_SEND, NULL, GetCmdSendToDepot(this->vehicle_type));
 						break;
 					case GALF_ADD_SHARED: // Add shared Vehicles
 						assert(IsValidGroupID(this->group_sel));
 					break;
 						DoCommandP(0, this->group_sel, this->vehicle_type, NULL, CMD_ADD_SHARED_VEHICLE_GROUP | CMD_MSG(STR_GROUP_CAN_T_ADD_SHARED_VEHICLE));
 						break;
 					case GALF_REMOVE_ALL: // Remove all Vehicles from the selected group
 						assert(IsValidGroupID(this->group_sel));
 						DoCommandP(0, this->group_sel, this->vehicle_type, NULL, CMD_REMOVE_ALL_VEHICLES_GROUP | CMD_MSG(STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES));
 						break;
 					default: NOT_REACHED();
+				}
+			}
 			_cursor.vehchain = false;
 			break;
 				break;
 			default: NOT_REACHED();
+		}
 		case WE_ON_EDIT_TEXT:
 			if (!StrEmpty(e->we.edittext.str)) {
 				_cmd_text = e->we.edittext.str;
 				DoCommandP(0, gv->group_sel, 0, NULL, CMD_RENAME_GROUP | CMD_MSG(STR_GROUP_CAN_T_RENAME));
+			}
 			break;
 		case WE_RESIZE:
 			w->hscroll.cap += e->we.sizing.diff.x;
 			w->vscroll.cap += e->we.sizing.diff.y / PLY_WND_PRC__SIZE_OF_ROW_TINY;
 			w->vscroll2.cap += e->we.sizing.diff.y / (int)w->resize.step_height;
 			w->widget[GRP_WIDGET_LIST_GROUP].data = (w->vscroll.cap << 8) + 1;
 			w->widget[GRP_WIDGET_LIST_VEHICLE].data = (w->vscroll2.cap << 8) + 1;
 			break;
 		case WE_DROPDOWN_SELECT: // we have selected a dropdown item in the list
 			switch (e->we.dropdown.button) {
 				case GRP_WIDGET_SORT_BY_DROPDOWN:
 					if (vl->sort_type != e->we.dropdown.index) {
 						vl->flags |= VL_RESORT;
 						vl->sort_type = e->we.dropdown.index;
 						gv->sorting->criteria = vl->sort_type;
+					}
 					break;
 				case GRP_WIDGET_MANAGE_VEHICLES_DROPDOWN:
 					assert(vl->list_length != 0);
 					switch (e->we.dropdown.index) {
 						case GALF_REPLACE: // Replace window
 							ShowReplaceGroupVehicleWindow(gv->group_sel, gv->vehicle_type);
 							break;
 						case GALF_SERVICE: // Send for servicing
 							DoCommandP(0, gv->group_sel, ((IsAllGroupID(gv->group_sel) ? VLW_STANDARD : VLW_GROUP_LIST) & VLW_MASK)
 										| DEPOT_MASS_SEND
 										| DEPOT_SERVICE, NULL, GetCmdSendToDepot(gv->vehicle_type));
 							break;
 						case GALF_DEPOT: // Send to Depots
 							DoCommandP(0, gv->group_sel, ((IsAllGroupID(gv->group_sel) ? VLW_STANDARD : VLW_GROUP_LIST) & VLW_MASK)
 										| DEPOT_MASS_SEND, NULL, GetCmdSendToDepot(gv->vehicle_type));
 							break;
 						case GALF_ADD_SHARED: // Add shared Vehicles
 							assert(IsValidGroupID(gv->group_sel));
 		this->SetDirty();
+	}
 							DoCommandP(0, gv->group_sel, gv->vehicle_type, NULL, CMD_ADD_SHARED_VEHICLE_GROUP | CMD_MSG(STR_GROUP_CAN_T_ADD_SHARED_VEHICLE));
 							break;
 						case GALF_REMOVE_ALL: // Remove all Vehicles from the selected group
 							assert(IsValidGroupID(gv->group_sel));
 							DoCommandP(0, gv->group_sel, gv->vehicle_type, NULL, CMD_REMOVE_ALL_VEHICLES_GROUP | CMD_MSG(STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES));
 							break;
 						default: NOT_REACHED();
+					}
 					break;
 				default: NOT_REACHED();
+			}
 			w->SetDirty();
 			break;
 		case WE_DESTROY:
 			free((void*)vl->sort_list);
 			free((void*)gl->sort_list);
 			break;
 	virtual void OnTick()
+	{
 		if (_pause_game != 0) return;
 		if (--this->vehicles.resort_timer == 0) {
 			this->vehicles.resort_timer = DAY_TICKS * PERIODIC_RESORT_DAYS;
 			this->vehicles.flags |= VL_RESORT;
 			this->SetDirty();
+		}
 		if (--this->groups.resort_timer == 0) {
 			this->groups.resort_timer = DAY_TICKS * PERIODIC_RESORT_DAYS;
 			this->groups.flags |= VL_RESORT;
 			this->SetDirty();
+		}
+	}
 		case WE_TICK: // resort the lists every 20 seconds orso (10 days)
 			if (_pause_game != 0) break;
 			if (--vl->resort_timer == 0) {
 				vl->resort_timer = DAY_TICKS * PERIODIC_RESORT_DAYS;
 				vl->flags |= VL_RESORT;
 				w->SetDirty();
+			}
 			if (--gl->resort_timer == 0) {
 				gl->resort_timer = DAY_TICKS * PERIODIC_RESORT_DAYS;
 				gl->flags |= VL_RESORT;
 				w->SetDirty();
+			}
 			break;
 		case WE_ABORT_PLACE_OBJ: // called when new object to place is selected from keyboard
 	virtual void OnPlaceObjectAbort()
+	{
 			/* abort drag & drop */
 			gv->vehicle_sel = INVALID_VEHICLE;
 			w->InvalidateWidget(GRP_WIDGET_LIST_VEHICLE);
 			break;
 			this->vehicle_sel = INVALID_VEHICLE;
 			this->InvalidateWidget(GRP_WIDGET_LIST_VEHICLE);
+	}
+}
+};
 static const WindowDesc _group_desc = {
@@ @@ -781,7 +758,7 @@ static const WindowDesc _group_desc = { @@
 	WC_TRAINS_LIST, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
 	_group_widgets,
-	GroupWndProc
+	NULL
 };
 void ShowPlayerGroup(PlayerID player, VehicleType vehicle_type)
@@ @@ -800,8 +777,6 @@ void ShowPlayerGroup(PlayerID player, Ve @@
 	WindowNumber num = (vehicle_type << 11) | VLW_GROUP_LIST | player;
 	DeleteWindowById(wc, num);
 	Window *w = AllocateWindowDescFront<Window>(&_group_desc, num);
 	if (w == NULL) return;
 	Window *w = new VehicleGroupWindow(&_group_desc, num);
 	w->window_class = wc;
+}

src/vehicle_gui.cpp

➞

Show inline comments

@@ @@ -116,7 +116,7 @@ static void SetVehicleListsFlag(SortList @@
 			case WC_ROADVEH_LIST:
 			case WC_SHIPS_LIST:
 			case WC_AIRCRAFT_LIST:
-				WP(w, vehiclelist_d).vehicles.flags |= sl_flag;
+				dynamic_cast<VehicleListBase*>(w)->vehicles.flags |= sl_flag;
 				w->SetDirty();
 				break;
@@ @@ -141,7 +141,7 @@ void ResortVehicleLists() @@
 	SetVehicleListsFlag(VL_RESORT);
+}
-void BuildVehicleList(vehiclelist_d *vl, PlayerID owner, uint16 index, uint16 window_type)
+void BuildVehicleList(VehicleListBase *vl, PlayerID owner, uint16 index, uint16 window_type)
+{
 	if (!(vl->vehicles.flags & VL_REBUILD)) return;
@@ @@ -157,7 +157,7 @@ void BuildVehicleList(vehiclelist_d *vl, @@
 static const Vehicle *_last_vehicle[2] = { NULL, NULL };
 static char           _last_name[2][64] = { "", "" };
-void SortVehicleList(vehiclelist_d *vl)
+void SortVehicleList(VehicleListBase *vl)
+{
 	if (!(vl->vehicles.flags & VL_RESORT)) return;
@@ @@ -807,127 +807,6 @@ static const Widget _vehicle_list_widget @@
 	{   WIDGETS_END},
 };
 static void CreateVehicleListWindow(Window *w)
+{
 	vehiclelist_d *vl = &WP(w, vehiclelist_d);
 	uint16 window_type = w->window_number & VLW_MASK;
 	PlayerID player = (PlayerID)GB(w->window_number, 0, 8);
 	vl->vehicle_type = (VehicleType)GB(w->window_number, 11, 5);
 	vl->vehicles.list_length = 0;
 	vl->vehicles.sort_list = NULL;
 	w->caption_color = player;
 	/* Hide the widgets that we will not use in this window
 	 * Some windows contains actions only fit for the owner */
 	if (player == _local_player) {
 		w->HideWidget(VLW_WIDGET_OTHER_PLAYER_FILLER);
 		w->SetWidgetDisabledState(VLW_WIDGET_AVAILABLE_VEHICLES, window_type != VLW_STANDARD);
 	} else {
 		w->SetWidgetsHiddenState(true,
 			VLW_WIDGET_AVAILABLE_VEHICLES,
 			VLW_WIDGET_MANAGE_VEHICLES_DROPDOWN,
 			VLW_WIDGET_STOP_ALL,
 			VLW_WIDGET_START_ALL,
 			VLW_WIDGET_EMPTY_BOTTOM_RIGHT,
 			WIDGET_LIST_END);
+	}
 	/* Set up the window widgets */
 	switch (vl->vehicle_type) {
 		case VEH_TRAIN:
 			w->widget[VLW_WIDGET_LIST].tooltips          = STR_883D_TRAINS_CLICK_ON_TRAIN_FOR;
 			w->widget[VLW_WIDGET_AVAILABLE_VEHICLES].data = STR_AVAILABLE_TRAINS;
 			break;
 		case VEH_ROAD:
 			w->widget[VLW_WIDGET_LIST].tooltips          = STR_901A_ROAD_VEHICLES_CLICK_ON;
 			w->widget[VLW_WIDGET_AVAILABLE_VEHICLES].data = STR_AVAILABLE_ROAD_VEHICLES;
 			break;
 		case VEH_SHIP:
 			w->widget[VLW_WIDGET_LIST].tooltips          = STR_9823_SHIPS_CLICK_ON_SHIP_FOR;
 			w->widget[VLW_WIDGET_AVAILABLE_VEHICLES].data = STR_AVAILABLE_SHIPS;
 			break;
 		case VEH_AIRCRAFT:
 			w->widget[VLW_WIDGET_LIST].tooltips          = STR_A01F_AIRCRAFT_CLICK_ON_AIRCRAFT;
 			w->widget[VLW_WIDGET_AVAILABLE_VEHICLES].data = STR_AVAILABLE_AIRCRAFT;
 			break;
 		default: NOT_REACHED();
+	}
 	switch (window_type) {
 		case VLW_SHARED_ORDERS:
 			w->widget[VLW_WIDGET_CAPTION].data  = STR_VEH_WITH_SHARED_ORDERS_LIST;
 			break;
 		case VLW_STANDARD: /* Company Name - standard widget setup */
 			switch (vl->vehicle_type) {
 				case VEH_TRAIN:    w->widget[VLW_WIDGET_CAPTION].data = STR_881B_TRAINS;        break;
 				case VEH_ROAD:     w->widget[VLW_WIDGET_CAPTION].data = STR_9001_ROAD_VEHICLES; break;
 				case VEH_SHIP:     w->widget[VLW_WIDGET_CAPTION].data = STR_9805_SHIPS;         break;
 				case VEH_AIRCRAFT: w->widget[VLW_WIDGET_CAPTION].data = STR_A009_AIRCRAFT;      break;
 				default: NOT_REACHED(); break;
+			}
 			break;
 		case VLW_STATION_LIST: /* Station Name */
 			switch (vl->vehicle_type) {
 				case VEH_TRAIN:    w->widget[VLW_WIDGET_CAPTION].data = STR_SCHEDULED_TRAINS;        break;
 				case VEH_ROAD:     w->widget[VLW_WIDGET_CAPTION].data = STR_SCHEDULED_ROAD_VEHICLES; break;
 				case VEH_SHIP:     w->widget[VLW_WIDGET_CAPTION].data = STR_SCHEDULED_SHIPS;         break;
 				case VEH_AIRCRAFT: w->widget[VLW_WIDGET_CAPTION].data = STR_SCHEDULED_AIRCRAFT;      break;
 				default: NOT_REACHED(); break;
+			}
 			break;
 		case VLW_DEPOT_LIST:
 			switch (vl->vehicle_type) {
 				case VEH_TRAIN:    w->widget[VLW_WIDGET_CAPTION].data = STR_VEHICLE_LIST_TRAIN_DEPOT;    break;
 				case VEH_ROAD:     w->widget[VLW_WIDGET_CAPTION].data = STR_VEHICLE_LIST_ROADVEH_DEPOT;  break;
 				case VEH_SHIP:     w->widget[VLW_WIDGET_CAPTION].data = STR_VEHICLE_LIST_SHIP_DEPOT;     break;
 				case VEH_AIRCRAFT: w->widget[VLW_WIDGET_CAPTION].data = STR_VEHICLE_LIST_AIRCRAFT_DEPOT; break;
 				default: NOT_REACHED(); break;
+			}
 			break;
 		default: NOT_REACHED(); break;
+	}
 	switch (vl->vehicle_type) {
 		case VEH_TRAIN:
 			w->resize.step_width = 1;
 			/* Fallthrough */
 		case VEH_ROAD:
 			w->vscroll.cap = 7;
 			w->resize.step_height = PLY_WND_PRC__SIZE_OF_ROW_SMALL;
 			w->resize.height = 220 - (PLY_WND_PRC__SIZE_OF_ROW_SMALL * 3); // Minimum of 4 vehicles
 			break;
 		case VEH_SHIP:
 		case VEH_AIRCRAFT:
 			w->vscroll.cap = 4;
 			w->resize.step_height = PLY_WND_PRC__SIZE_OF_ROW_BIG;
 			break;
 		default: NOT_REACHED();
+	}
 	w->widget[VLW_WIDGET_LIST].data = (w->vscroll.cap << 8) + 1;
 	/* Set up sorting. Make the window-specific _sorting variable
 		* point to the correct global _sorting struct so we are freed
 		* from having conditionals during window operation */
 	switch (vl->vehicle_type) {
 		case VEH_TRAIN:    vl->sorting = &_sorting.train; break;
 		case VEH_ROAD:     vl->sorting = &_sorting.roadveh; break;
 		case VEH_SHIP:     vl->sorting = &_sorting.ship; break;
 		case VEH_AIRCRAFT: vl->sorting = &_sorting.aircraft; break;
 		default: NOT_REACHED(); break;
+	}
 	vl->vehicles.flags = VL_REBUILD | (vl->sorting->order ? VL_DESC : VL_NONE);
 	vl->vehicles.sort_type = vl->sorting->criteria;
 	vl->vehicles.resort_timer = DAY_TICKS * PERIODIC_RESORT_DAYS; // Set up resort timer
+}
 void DrawSmallOrderList(const Vehicle *v, int x, int y)
+{
 	const Order *order;
@@ @@ -951,254 +830,371 @@ void DrawSmallOrderList(const Vehicle *v @@
+	}
+}
 static void DrawVehicleListWindow(Window *w)
+{
 	vehiclelist_d *vl = &WP(w, vehiclelist_d);
 	int x = 2;
 	int y = PLY_WND_PRC__OFFSET_TOP_WIDGET;
 	int max;
 	int i;
 	const PlayerID owner = (PlayerID)w->caption_color;
 	const uint16 window_type = w->window_number & VLW_MASK;
 	const uint16 index = GB(w->window_number, 16, 16);
 	BuildVehicleList(vl, owner, index, window_type);
 	SortVehicleList(vl);
 	SetVScrollCount(w, vl->vehicles.list_length);
 	/* draw the widgets */
 	switch (window_type) {
 		case VLW_SHARED_ORDERS: /* Shared Orders */
 			if (vl->vehicles.list_length == 0) {
 				/* We can't open this window without vehicles using this order
 				 * and we should close the window when deleting the order      */
 				NOT_REACHED();
+			}
 			SetDParam(0, w->vscroll.count);
 			break;
 		case VLW_STANDARD: /* Company Name */
 			SetDParam(0, owner);
 			SetDParam(1, w->vscroll.count);
 			break;
 		case VLW_STATION_LIST: /* Station Name */
 			SetDParam(0, index);
 			SetDParam(1, w->vscroll.count);
 			break;
 		case VLW_DEPOT_LIST:
 			switch (vl->vehicle_type) {
 				case VEH_TRAIN:    SetDParam(0, STR_8800_TRAIN_DEPOT);        break;
 				case VEH_ROAD:     SetDParam(0, STR_9003_ROAD_VEHICLE_DEPOT); break;
 				case VEH_SHIP:     SetDParam(0, STR_9803_SHIP_DEPOT);         break;
 				case VEH_AIRCRAFT: SetDParam(0, STR_A002_AIRCRAFT_HANGAR);    break;
 				default: NOT_REACHED(); break;
+			}
 			if (vl->vehicle_type == VEH_AIRCRAFT) {
 				SetDParam(1, index); // Airport name
 			} else {
 				SetDParam(1, GetDepot(index)->town_index);
+			}
 			SetDParam(2, w->vscroll.count);
 			break;
 		default: NOT_REACHED(); break;
+	}
 	w->SetWidgetsDisabledState(vl->vehicles.list_length == 0,
 		VLW_WIDGET_MANAGE_VEHICLES_DROPDOWN,
 		VLW_WIDGET_STOP_ALL,
 		VLW_WIDGET_START_ALL,
 		WIDGET_LIST_END);
 	DrawWindowWidgets(w);
 	/* draw sorting criteria string */
 	DrawString(85, 15, _vehicle_sort_listing[vl->vehicles.sort_type], TC_BLACK);
 	/* draw arrow pointing up/down for ascending/descending sorting */
 	DrawSortButtonState(w, VLW_WIDGET_SORT_ORDER, vl->vehicles.flags & VL_DESC ? SBS_DOWN : SBS_UP);
 	max = min(w->vscroll.pos + w->vscroll.cap, vl->vehicles.list_length);
 	for (i = w->vscroll.pos; i < max; ++i) {
 		const Vehicle *v = vl->vehicles.sort_list[i];
 		StringID str;
 		SetDParam(0, v->GetDisplayProfitThisYear());
 		SetDParam(1, v->GetDisplayProfitLastYear());
 		DrawVehicleImage(v, x + 19, y + 6, INVALID_VEHICLE, w->widget[VLW_WIDGET_LIST].right - w->widget[VLW_WIDGET_LIST].left - 20, 0);
 		DrawString(x + 19, y + w->resize.step_height - 8, STR_0198_PROFIT_THIS_YEAR_LAST_YEAR, TC_FROMSTRING);
 		if (v->name != NULL) {
 			/* The vehicle got a name so we will print it */
 			SetDParam(0, v->index);
 			DrawString(x + 19, y, STR_01AB, TC_FROMSTRING);
+		}
 		if (w->resize.step_height == PLY_WND_PRC__SIZE_OF_ROW_BIG) DrawSmallOrderList(v, x + 138, y);
 		if (v->IsInDepot()) {
 			str = STR_021F;
 		} else {
 			str = (v->age > v->max_age - 366) ? STR_00E3 : STR_00E2;
+		}
 		SetDParam(0, v->unitnumber);
 		DrawString(x, y + 2, str, TC_FROMSTRING);
 		DrawVehicleProfitButton(v, x, y + 13);
 		y += w->resize.step_height;
+	}
+}
 /*
 /**
  * Window for the (old) vehicle listing.
+ *
  * bitmask for w->window_number
  * 0-7 PlayerID (owner)
  * 8-10 window type (use flags in vehicle_gui.h)
  * 11-15 vehicle type (using VEH_, but can be compressed to fewer bytes if needed)
  * 16-31 StationID or OrderID depending on window type (bit 8-10)
  **/
 void PlayerVehWndProc(Window *w, WindowEvent *e)
+{
 	vehiclelist_d *vl = &WP(w, vehiclelist_d);
  */
 struct VehicleListWindow : public Window, public VehicleListBase {
 	VehicleListWindow(const WindowDesc *desc, void *data, WindowNumber window_number) : Window(desc, data, window_number)
+	{
 		uint16 window_type = this->window_number & VLW_MASK;
 		PlayerID player = (PlayerID)GB(this->window_number, 0, 8);
 		this->vehicle_type = (VehicleType)GB(this->window_number, 11, 5);
 		this->vehicles.list_length = 0;
 		this->vehicles.sort_list = NULL;
 		this->caption_color = player;
 	switch (e->event) {
 		case WE_CREATE:
 			CreateVehicleListWindow(w);
 			break;
 		/* Hide the widgets that we will not use in this window
 		* Some windows contains actions only fit for the owner */
 		if (player == _local_player) {
 			this->HideWidget(VLW_WIDGET_OTHER_PLAYER_FILLER);
 			this->SetWidgetDisabledState(VLW_WIDGET_AVAILABLE_VEHICLES, window_type != VLW_STANDARD);
 		} else {
 			this->SetWidgetsHiddenState(true,
 				VLW_WIDGET_AVAILABLE_VEHICLES,
 				VLW_WIDGET_MANAGE_VEHICLES_DROPDOWN,
 				VLW_WIDGET_STOP_ALL,
 				VLW_WIDGET_START_ALL,
 				VLW_WIDGET_EMPTY_BOTTOM_RIGHT,
 				WIDGET_LIST_END);
+		}
 		case WE_PAINT:
 			DrawVehicleListWindow(w);
 			break;
 		/* Set up the window widgets */
 		switch (this->vehicle_type) {
 			case VEH_TRAIN:
 				this->widget[VLW_WIDGET_LIST].tooltips          = STR_883D_TRAINS_CLICK_ON_TRAIN_FOR;
 				this->widget[VLW_WIDGET_AVAILABLE_VEHICLES].data = STR_AVAILABLE_TRAINS;
 				break;
 		case WE_CLICK: {
 			switch (e->we.click.widget) {
 				case VLW_WIDGET_SORT_ORDER: /* Flip sorting method ascending/descending */
 					vl->vehicles.flags ^= VL_DESC;
 					vl->vehicles.flags |= VL_RESORT;
 			case VEH_ROAD:
 				this->widget[VLW_WIDGET_LIST].tooltips          = STR_901A_ROAD_VEHICLES_CLICK_ON;
 				this->widget[VLW_WIDGET_AVAILABLE_VEHICLES].data = STR_AVAILABLE_ROAD_VEHICLES;
 				break;
 			case VEH_SHIP:
 				this->widget[VLW_WIDGET_LIST].tooltips          = STR_9823_SHIPS_CLICK_ON_SHIP_FOR;
 				this->widget[VLW_WIDGET_AVAILABLE_VEHICLES].data = STR_AVAILABLE_SHIPS;
 				break;
 			case VEH_AIRCRAFT:
 				this->widget[VLW_WIDGET_LIST].tooltips          = STR_A01F_AIRCRAFT_CLICK_ON_AIRCRAFT;
 				this->widget[VLW_WIDGET_AVAILABLE_VEHICLES].data = STR_AVAILABLE_AIRCRAFT;
 				break;
 			default: NOT_REACHED();
+		}
 					vl->sorting->order = !!(vl->vehicles.flags & VL_DESC);
 					w->SetDirty();
 					break;
 				case VLW_WIDGET_SORT_BY_PULLDOWN:/* Select sorting criteria dropdown menu */
 					ShowDropDownMenu(w, _vehicle_sort_listing, vl->vehicles.sort_type, VLW_WIDGET_SORT_BY_PULLDOWN, 0, (vl->vehicle_type == VEH_TRAIN || vl->vehicle_type == VEH_ROAD) ? 0 : (1 << 10));
 					return;
 				case VLW_WIDGET_LIST: { /* Matrix to show vehicles */
 					uint32 id_v = (e->we.click.pt.y - PLY_WND_PRC__OFFSET_TOP_WIDGET) / w->resize.step_height;
 					const Vehicle *v;
 					if (id_v >= w->vscroll.cap) return; // click out of bounds
 		switch (window_type) {
 			case VLW_SHARED_ORDERS:
 				this->widget[VLW_WIDGET_CAPTION].data  = STR_VEH_WITH_SHARED_ORDERS_LIST;
 				break;
 			case VLW_STANDARD: /* Company Name - standard widget setup */
 				switch (this->vehicle_type) {
 					case VEH_TRAIN:    this->widget[VLW_WIDGET_CAPTION].data = STR_881B_TRAINS;        break;
 					case VEH_ROAD:     this->widget[VLW_WIDGET_CAPTION].data = STR_9001_ROAD_VEHICLES; break;
 					case VEH_SHIP:     this->widget[VLW_WIDGET_CAPTION].data = STR_9805_SHIPS;         break;
 					case VEH_AIRCRAFT: this->widget[VLW_WIDGET_CAPTION].data = STR_A009_AIRCRAFT;      break;
 					default: NOT_REACHED(); break;
+				}
 				break;
 			case VLW_STATION_LIST: /* Station Name */
 				switch (this->vehicle_type) {
 					case VEH_TRAIN:    this->widget[VLW_WIDGET_CAPTION].data = STR_SCHEDULED_TRAINS;        break;
 					case VEH_ROAD:     this->widget[VLW_WIDGET_CAPTION].data = STR_SCHEDULED_ROAD_VEHICLES; break;
 					case VEH_SHIP:     this->widget[VLW_WIDGET_CAPTION].data = STR_SCHEDULED_SHIPS;         break;
 					case VEH_AIRCRAFT: this->widget[VLW_WIDGET_CAPTION].data = STR_SCHEDULED_AIRCRAFT;      break;
 					default: NOT_REACHED(); break;
+				}
 				break;
 					id_v += w->vscroll.pos;
 					if (id_v >= vl->vehicles.list_length) return; // click out of list bound
 					v = vl->vehicles.sort_list[id_v];
 			case VLW_DEPOT_LIST:
 				switch (this->vehicle_type) {
 					case VEH_TRAIN:    this->widget[VLW_WIDGET_CAPTION].data = STR_VEHICLE_LIST_TRAIN_DEPOT;    break;
 					case VEH_ROAD:     this->widget[VLW_WIDGET_CAPTION].data = STR_VEHICLE_LIST_ROADVEH_DEPOT;  break;
 					case VEH_SHIP:     this->widget[VLW_WIDGET_CAPTION].data = STR_VEHICLE_LIST_SHIP_DEPOT;     break;
 					case VEH_AIRCRAFT: this->widget[VLW_WIDGET_CAPTION].data = STR_VEHICLE_LIST_AIRCRAFT_DEPOT; break;
 					default: NOT_REACHED(); break;
+				}
 				break;
 			default: NOT_REACHED(); break;
+		}
 					ShowVehicleViewWindow(v);
 				} break;
 		switch (this->vehicle_type) {
 			case VEH_TRAIN:
 				this->resize.step_width = 1;
 				/* Fallthrough */
 			case VEH_ROAD:
 				this->vscroll.cap = 7;
 				this->resize.step_height = PLY_WND_PRC__SIZE_OF_ROW_SMALL;
 				this->resize.height = 220 - (PLY_WND_PRC__SIZE_OF_ROW_SMALL * 3); // Minimum of 4 vehicles
 				break;
 			case VEH_SHIP:
 			case VEH_AIRCRAFT:
 				this->vscroll.cap = 4;
 				this->resize.step_height = PLY_WND_PRC__SIZE_OF_ROW_BIG;
 				break;
 			default: NOT_REACHED();
+		}
 				case VLW_WIDGET_AVAILABLE_VEHICLES:
 					ShowBuildVehicleWindow(0, vl->vehicle_type);
 					break;
 		this->widget[VLW_WIDGET_LIST].data = (this->vscroll.cap << 8) + 1;
 		/* Set up sorting. Make the window-specific _sorting variable
 			* point to the correct global _sorting struct so we are freed
 			* from having conditionals during window operation */
 		switch (this->vehicle_type) {
 			case VEH_TRAIN:    this->sorting = &_sorting.train; break;
 			case VEH_ROAD:     this->sorting = &_sorting.roadveh; break;
 			case VEH_SHIP:     this->sorting = &_sorting.ship; break;
 			case VEH_AIRCRAFT: this->sorting = &_sorting.aircraft; break;
 			default: NOT_REACHED(); break;
+		}
 				case VLW_WIDGET_MANAGE_VEHICLES_DROPDOWN: {
 					static StringID action_str[] = {
 						STR_REPLACE_VEHICLES,
 						STR_SEND_FOR_SERVICING,
 						STR_NULL,
 						INVALID_STRING_ID
 					};
 		this->vehicles.flags = VL_REBUILD | (this->sorting->order ? VL_DESC : VL_NONE);
 		this->vehicles.sort_type = this->sorting->criteria;
 		this->vehicles.resort_timer = DAY_TICKS * PERIODIC_RESORT_DAYS; // Set up resort timer
 		this->FindWindowPlacementAndResize(desc);
+	}
 	~VehicleListWindow()
+	{
 		free((void*)this->vehicles.sort_list);
+	}
 	virtual void OnPaint()
+	{
 		int x = 2;
 		int y = PLY_WND_PRC__OFFSET_TOP_WIDGET;
 		int max;
 		int i;
 		const PlayerID owner = (PlayerID)this->caption_color;
 		const uint16 window_type = this->window_number & VLW_MASK;
 		const uint16 index = GB(this->window_number, 16, 16);
 					static const StringID depot_name[] = {
 						STR_SEND_TRAIN_TO_DEPOT,
 						STR_SEND_ROAD_VEHICLE_TO_DEPOT,
 						STR_SEND_SHIP_TO_DEPOT,
 						STR_SEND_AIRCRAFT_TO_HANGAR
 					};
 		BuildVehicleList(this, owner, index, window_type);
 		SortVehicleList(this);
 		SetVScrollCount(this, this->vehicles.list_length);
 					/* XXX - Substite string since the dropdown cannot handle dynamic strings */
 					action_str[2] = depot_name[vl->vehicle_type];
 					ShowDropDownMenu(w, action_str, 0, VLW_WIDGET_MANAGE_VEHICLES_DROPDOWN, 0, (w->window_number & VLW_MASK) == VLW_STANDARD ? 0 : 1);
 					break;
 		/* draw the widgets */
 		switch (window_type) {
 			case VLW_SHARED_ORDERS: /* Shared Orders */
 				if (this->vehicles.list_length == 0) {
 					/* We can't open this window without vehicles using this order
 					* and we should close the window when deleting the order      */
 					NOT_REACHED();
+				}
 				SetDParam(0, this->vscroll.count);
 				break;
 			case VLW_STANDARD: /* Company Name */
 				SetDParam(0, owner);
 				SetDParam(1, this->vscroll.count);
 				break;
 			case VLW_STATION_LIST: /* Station Name */
 				SetDParam(0, index);
 				SetDParam(1, this->vscroll.count);
 				break;
 				case VLW_WIDGET_STOP_ALL:
 				case VLW_WIDGET_START_ALL:
 					DoCommandP(0, GB(w->window_number, 16, 16), (w->window_number & VLW_MASK) | (1 << 6) | (e->we.click.widget == VLW_WIDGET_START_ALL ? (1 << 5) : 0) | vl->vehicle_type, NULL, CMD_MASS_START_STOP);
 					break;
+			}
 		} break;
 			case VLW_DEPOT_LIST:
 				switch (this->vehicle_type) {
 					case VEH_TRAIN:    SetDParam(0, STR_8800_TRAIN_DEPOT);        break;
 					case VEH_ROAD:     SetDParam(0, STR_9003_ROAD_VEHICLE_DEPOT); break;
 					case VEH_SHIP:     SetDParam(0, STR_9803_SHIP_DEPOT);         break;
 					case VEH_AIRCRAFT: SetDParam(0, STR_A002_AIRCRAFT_HANGAR);    break;
 					default: NOT_REACHED(); break;
+				}
 				if (this->vehicle_type == VEH_AIRCRAFT) {
 					SetDParam(1, index); // Airport name
 				} else {
 					SetDParam(1, GetDepot(index)->town_index);
+				}
 				SetDParam(2, this->vscroll.count);
 				break;
 			default: NOT_REACHED(); break;
+		}
 		this->SetWidgetsDisabledState(this->vehicles.list_length == 0,
 			VLW_WIDGET_MANAGE_VEHICLES_DROPDOWN,
 			VLW_WIDGET_STOP_ALL,
 			VLW_WIDGET_START_ALL,
 			WIDGET_LIST_END);
 		DrawWindowWidgets(this);
 		/* draw sorting criteria string */
 		DrawString(85, 15, _vehicle_sort_listing[this->vehicles.sort_type], TC_BLACK);
 		/* draw arrow pointing up/down for ascending/descending sorting */
 		DrawSortButtonState(this, VLW_WIDGET_SORT_ORDER, this->vehicles.flags & VL_DESC ? SBS_DOWN : SBS_UP);
 		max = min(this->vscroll.pos + this->vscroll.cap, this->vehicles.list_length);
 		for (i = this->vscroll.pos; i < max; ++i) {
 			const Vehicle *v = this->vehicles.sort_list[i];
 			StringID str;
 			SetDParam(0, v->GetDisplayProfitThisYear());
 			SetDParam(1, v->GetDisplayProfitLastYear());
 			DrawVehicleImage(v, x + 19, y + 6, INVALID_VEHICLE, this->widget[VLW_WIDGET_LIST].right - this->widget[VLW_WIDGET_LIST].left - 20, 0);
 			DrawString(x + 19, y + this->resize.step_height - 8, STR_0198_PROFIT_THIS_YEAR_LAST_YEAR, TC_FROMSTRING);
 		case WE_DROPDOWN_SELECT: /* we have selected a dropdown item in the list */
 			switch (e->we.dropdown.button) {
 				case VLW_WIDGET_SORT_BY_PULLDOWN:
 					if (vl->vehicles.sort_type != e->we.dropdown.index) {
 						/* value has changed -> resort */
 						vl->vehicles.flags |= VL_RESORT;
 						vl->vehicles.sort_type = e->we.dropdown.index;
 						vl->sorting->criteria = vl->vehicles.sort_type;
+					}
 					break;
 				case VLW_WIDGET_MANAGE_VEHICLES_DROPDOWN:
 					assert(vl->vehicles.list_length != 0);
 			if (v->name != NULL) {
 				/* The vehicle got a name so we will print it */
 				SetDParam(0, v->index);
 				DrawString(x + 19, y, STR_01AB, TC_FROMSTRING);
+			}
 			if (this->resize.step_height == PLY_WND_PRC__SIZE_OF_ROW_BIG) DrawSmallOrderList(v, x + 138, y);
 			if (v->IsInDepot()) {
 				str = STR_021F;
 			} else {
 				str = (v->age > v->max_age - 366) ? STR_00E3 : STR_00E2;
+			}
 			SetDParam(0, v->unitnumber);
 			DrawString(x, y + 2, str, TC_FROMSTRING);
 			DrawVehicleProfitButton(v, x, y + 13);
 			y += this->resize.step_height;
+		}
+	}
 	virtual void OnClick(Point pt, int widget)
+	{
 		switch (widget) {
 			case VLW_WIDGET_SORT_ORDER: /* Flip sorting method ascending/descending */
 				this->vehicles.flags ^= VL_DESC;
 				this->vehicles.flags |= VL_RESORT;
 				this->sorting->order = !!(this->vehicles.flags & VL_DESC);
 				this->SetDirty();
 				break;
 			case VLW_WIDGET_SORT_BY_PULLDOWN:/* Select sorting criteria dropdown menu */
 				ShowDropDownMenu(this, _vehicle_sort_listing, this->vehicles.sort_type, VLW_WIDGET_SORT_BY_PULLDOWN, 0, (this->vehicle_type == VEH_TRAIN || this->vehicle_type == VEH_ROAD) ? 0 : (1 << 10));
 				return;
 			case VLW_WIDGET_LIST: { /* Matrix to show vehicles */
 				uint32 id_v = (pt.y - PLY_WND_PRC__OFFSET_TOP_WIDGET) / this->resize.step_height;
 				const Vehicle *v;
 				if (id_v >= this->vscroll.cap) return; // click out of bounds
 				id_v += this->vscroll.pos;
 				if (id_v >= this->vehicles.list_length) return; // click out of list bound
 				v = this->vehicles.sort_list[id_v];
 					switch (e->we.dropdown.index) {
 						case 0: /* Replace window */
 							ShowReplaceGroupVehicleWindow(DEFAULT_GROUP, vl->vehicle_type);
 							break;
 						case 1: /* Send for servicing */
 							DoCommandP(0, GB(w->window_number, 16, 16) /* StationID or OrderID (depending on VLW) */,
 								(w->window_number & VLW_MASK) | DEPOT_MASS_SEND | DEPOT_SERVICE,
 								NULL,
 								GetCmdSendToDepot(vl->vehicle_type));
 							break;
 						case 2: /* Send to Depots */
 							DoCommandP(0, GB(w->window_number, 16, 16) /* StationID or OrderID (depending on VLW) */,
 								(w->window_number & VLW_MASK) | DEPOT_MASS_SEND,
 								NULL,
 								GetCmdSendToDepot(vl->vehicle_type));
 							break;
 				ShowVehicleViewWindow(v);
 			} break;
 			case VLW_WIDGET_AVAILABLE_VEHICLES:
 				ShowBuildVehicleWindow(0, this->vehicle_type);
 				break;
 						default: NOT_REACHED();
+					}
 					break;
 				default: NOT_REACHED();
 			case VLW_WIDGET_MANAGE_VEHICLES_DROPDOWN: {
 				static StringID action_str[] = {
 					STR_REPLACE_VEHICLES,
 					STR_SEND_FOR_SERVICING,
 					STR_NULL,
 					INVALID_STRING_ID
 				};
 				static const StringID depot_name[] = {
 					STR_SEND_TRAIN_TO_DEPOT,
 					STR_SEND_ROAD_VEHICLE_TO_DEPOT,
 					STR_SEND_SHIP_TO_DEPOT,
 					STR_SEND_AIRCRAFT_TO_HANGAR
 				};
 				/* XXX - Substite string since the dropdown cannot handle dynamic strings */
 				action_str[2] = depot_name[this->vehicle_type];
 				ShowDropDownMenu(this, action_str, 0, VLW_WIDGET_MANAGE_VEHICLES_DROPDOWN, 0, (this->window_number & VLW_MASK) == VLW_STANDARD ? 0 : 1);
 				break;
+			}
 			w->SetDirty();
 			break;
 			case VLW_WIDGET_STOP_ALL:
 			case VLW_WIDGET_START_ALL:
 				DoCommandP(0, GB(this->window_number, 16, 16), (this->window_number & VLW_MASK) | (1 << 6) | (widget == VLW_WIDGET_START_ALL ? (1 << 5) : 0) | this->vehicle_type, NULL, CMD_MASS_START_STOP);
 				break;
+		}
+	}
 		case WE_DESTROY:
 			free((void*)vl->vehicles.sort_list);
 			break;
 		case WE_TICK: /* resort the list every 20 seconds orso (10 days) */
 			if (_pause_game != 0) break;
 			if (--vl->vehicles.resort_timer == 0) {
 				StationID station = ((w->window_number & VLW_MASK) == VLW_STATION_LIST) ? GB(w->window_number, 16, 16) : INVALID_STATION;
 				PlayerID owner = (PlayerID)w->caption_color;
 	virtual void OnDropdownSelect(int widget, int index)
+	{
 		switch (widget) {
 			case VLW_WIDGET_SORT_BY_PULLDOWN:
 				if (this->vehicles.sort_type != index) {
 					/* value has changed -> resort */
 					this->vehicles.flags |= VL_RESORT;
 					this->vehicles.sort_type = index;
 					this->sorting->criteria = this->vehicles.sort_type;
+				}
 				break;
 			case VLW_WIDGET_MANAGE_VEHICLES_DROPDOWN:
 				assert(this->vehicles.list_length != 0);
 				DEBUG(misc, 3, "Periodic resort %d list player %d at station %d", vl->vehicle_type, owner, station);
 				vl->vehicles.resort_timer = DAY_TICKS * PERIODIC_RESORT_DAYS;
 				vl->vehicles.flags |= VL_RESORT;
 				w->SetDirty();
+			}
 			break;
 				switch (index) {
 					case 0: /* Replace window */
 						ShowReplaceGroupVehicleWindow(DEFAULT_GROUP, this->vehicle_type);
 						break;
 					case 1: /* Send for servicing */
 						DoCommandP(0, GB(this->window_number, 16, 16) /* StationID or OrderID (depending on VLW) */,
 							(this->window_number & VLW_MASK) | DEPOT_MASS_SEND | DEPOT_SERVICE,
 							NULL,
 							GetCmdSendToDepot(this->vehicle_type));
 						break;
 					case 2: /* Send to Depots */
 						DoCommandP(0, GB(this->window_number, 16, 16) /* StationID or OrderID (depending on VLW) */,
 							(this->window_number & VLW_MASK) | DEPOT_MASS_SEND,
 							NULL,
 							GetCmdSendToDepot(this->vehicle_type));
 						break;
 		case WE_RESIZE: /* Update the scroll + matrix */
 			w->vscroll.cap += e->we.sizing.diff.y / (int)w->resize.step_height;
 			w->widget[VLW_WIDGET_LIST].data = (w->vscroll.cap << 8) + 1;
 			break;
 					default: NOT_REACHED();
+				}
 				break;
 			default: NOT_REACHED();
+		}
 		this->SetDirty();
+	}
+}
 	virtual void OnTick()
+	{
 		if (_pause_game != 0) return;
 		if (--this->vehicles.resort_timer == 0) {
 			StationID station = ((this->window_number & VLW_MASK) == VLW_STATION_LIST) ? GB(this->window_number, 16, 16) : INVALID_STATION;
 			PlayerID owner = (PlayerID)this->caption_color;
 			DEBUG(misc, 3, "Periodic resort %d list player %d at station %d", this->vehicle_type, owner, station);
 			this->vehicles.resort_timer = DAY_TICKS * PERIODIC_RESORT_DAYS;
 			this->vehicles.flags |= VL_RESORT;
 			this->SetDirty();
+		}
+	}
 	virtual void OnResize(Point new_size, Point delta)
+	{
 		this->vscroll.cap += delta.y / (int)this->resize.step_height;
 		this->widget[VLW_WIDGET_LIST].data = (this->vscroll.cap << 8) + 1;
+	}
 };
 static const WindowDesc _player_vehicle_list_train_desc = {
 	WDP_AUTO, WDP_AUTO, 260, 182, 260, 182,
 	WC_TRAINS_LIST, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
 	_vehicle_list_widgets,
-	PlayerVehWndProc
+	NULL
 };
 static const WindowDesc _player_vehicle_list_road_veh_desc = {
@@ @@ -1206,7 +1202,7 @@ static const WindowDesc _player_vehicle_ @@
 	WC_ROADVEH_LIST, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
 	_vehicle_list_widgets,
-	PlayerVehWndProc
+	NULL
 };
 static const WindowDesc _player_vehicle_list_ship_desc = {
@@ @@ -1214,7 +1210,7 @@ static const WindowDesc _player_vehicle_ @@
 	WC_SHIPS_LIST, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
 	_vehicle_list_widgets,
-	PlayerVehWndProc
+	NULL
 };
 static const WindowDesc _player_vehicle_list_aircraft_desc = {
@@ @@ -1222,12 +1218,12 @@ static const WindowDesc _player_vehicle_ @@
 	WC_AIRCRAFT_LIST, WC_NONE,
 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS | WDF_STICKY_BUTTON | WDF_RESIZABLE,
 	_vehicle_list_widgets,
-	PlayerVehWndProc
+	NULL
 };
 static void ShowVehicleListWindowLocal(PlayerID player, uint16 VLW_flag, VehicleType vehicle_type, uint16 unique_number)
+{
-	Window *w;
+	VehicleListWindow *w;
 	WindowNumber num;
 	if (!IsValidPlayer(player)) return;
@@ @@ -1240,18 +1236,18 @@ static void ShowVehicleListWindowLocal(P @@
 	switch (vehicle_type) {
 		default: NOT_REACHED();
 		case VEH_TRAIN:
-			w = AllocateWindowDescFront<Window>(&_player_vehicle_list_train_desc, num);
+			w = AllocateWindowDescFront<VehicleListWindow>(&_player_vehicle_list_train_desc, num);
 			if (w != NULL) ResizeWindow(w, 65, 38);
 			break;
 		case VEH_ROAD:
-			w = AllocateWindowDescFront<Window>(&_player_vehicle_list_road_veh_desc, num);
+			w = AllocateWindowDescFront<VehicleListWindow>(&_player_vehicle_list_road_veh_desc, num);
 			if (w != NULL) ResizeWindow(w, 0, 38);
 			break;
 		case VEH_SHIP:
-			w = AllocateWindowDescFront<Window>(&_player_vehicle_list_ship_desc, num);
+			w = AllocateWindowDescFront<VehicleListWindow>(&_player_vehicle_list_ship_desc, num);
 			break;
 		case VEH_AIRCRAFT:
-			w = AllocateWindowDescFront<Window>(&_player_vehicle_list_aircraft_desc, num);
+			w = AllocateWindowDescFront<VehicleListWindow>(&_player_vehicle_list_aircraft_desc, num);
 			break;
+	}

src/vehicle_gui.h

➞

Show inline comments

@@ @@ -63,8 +63,6 @@ static inline bool ValidVLWFlags(uint16 @@
 	return (flags == VLW_STANDARD || flags == VLW_SHARED_ORDERS || flags == VLW_STATION_LIST || flags == VLW_DEPOT_LIST || flags == VLW_GROUP_LIST);
+}
 void PlayerVehWndProc(Window *w, struct WindowEvent *e);
 int DrawVehiclePurchaseInfo(int x, int y, uint w, EngineID engine_number);
 void DrawTrainImage(const Vehicle *v, int x, int y, VehicleID selection, int count, int skip);
@@ @@ -134,7 +132,7 @@ Vehicle *CheckClickOnVehicle(const struc @@
 typedef GUIList<const Vehicle*> GUIVehicleList;
-struct vehiclelist_d {
+struct VehicleListBase {
 	GUIVehicleList vehicles;  ///< The list of vehicles
 	Listing *sorting;         ///< Pointer to the vehicle type related sorting.
 	VehicleType vehicle_type; ///< The vehicle type that is sorted
@@ @@ -152,7 +150,7 @@ extern Sorting _sorting; @@
 /* sorter stuff */
 void RebuildVehicleLists();
 void ResortVehicleLists();
 void SortVehicleList(vehiclelist_d *vl);
 void BuildVehicleList(vehiclelist_d *vl, PlayerID owner, uint16 index, uint16 window_type);
 void SortVehicleList(VehicleListBase *vl);
 void BuildVehicleList(VehicleListBase *vl, PlayerID owner, uint16 index, uint16 window_type);
 #endif /* VEHICLE_GUI_H */

0 comments (0 inline, 0 general)