changeset 15517:d2a9ffd3a05a draft

(svn r20171) -Fix: Make the group list action dropdown also use vehicletype-specific texts like the normal vehicle list.
author frosch <frosch@openttd.org>
date Sat, 17 Jul 2010 14:53:46 +0000
parents 4f00a142e392
children 7f9f5cfa1510
files src/vehicle_gui.cpp src/vehicle_gui_base.h
diffstat 2 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/vehicle_gui.cpp
+++ b/src/vehicle_gui.cpp
@@ -97,6 +97,13 @@
 	INVALID_STRING_ID
 };
 
+const StringID BaseVehicleListWindow::vehicle_depot_name[] = {
+	STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT,
+	STR_VEHICLE_LIST_SEND_ROAD_VEHICLE_TO_DEPOT,
+	STR_VEHICLE_LIST_SEND_SHIP_TO_DEPOT,
+	STR_VEHICLE_LIST_SEND_AIRCRAFT_TO_HANGAR
+};
+
 void BaseVehicleListWindow::BuildVehicleList(Owner owner, uint16 index, uint16 window_type)
 {
 	if (!this->vehicles.NeedRebuild()) return;
@@ -136,7 +143,7 @@
 
 	d = maxdim(d, GetStringBoundingBox(STR_VEHICLE_LIST_REPLACE_VEHICLES));
 	d = maxdim(d, GetStringBoundingBox(STR_VEHICLE_LIST_SEND_FOR_SERVICING));
-	d = maxdim(d, GetStringBoundingBox(STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT));
+	d = maxdim(d, GetStringBoundingBox(this->vehicle_depot_name[this->vehicle_type]));
 
 	if (show_group) {
 		d = maxdim(d, GetStringBoundingBox(STR_GROUP_ADD_SHARED_VEHICLE));
@@ -157,7 +164,7 @@
 
 	list->push_back(new DropDownListStringItem(STR_VEHICLE_LIST_REPLACE_VEHICLES, ADI_REPLACE, false));
 	list->push_back(new DropDownListStringItem(STR_VEHICLE_LIST_SEND_FOR_SERVICING, ADI_SERVICE, false));
-	list->push_back(new DropDownListStringItem(STR_VEHICLE_LIST_SEND_TRAIN_TO_DEPOT, ADI_DEPOT, false));
+	list->push_back(new DropDownListStringItem(this->vehicle_depot_name[this->vehicle_type], ADI_DEPOT, false));
 
 	if (show_group) {
 		list->push_back(new DropDownListStringItem(STR_GROUP_ADD_SHARED_VEHICLE, ADI_ADD_SHARED, false));
--- a/src/vehicle_gui_base.h
+++ b/src/vehicle_gui_base.h
@@ -32,6 +32,7 @@
 		ADI_REMOVE_ALL,
 	};
 
+	static const StringID vehicle_depot_name[];
 	static const StringID vehicle_sorter_names[];
 	static GUIVehicleList::SortFunction * const vehicle_sorter_funcs[];