(svn r165) -Feature: Option to sort vehicles in vehicle-list window by different criteria. Total independent sort for all types and players. Periodic resort of list every 10 TTD days. Thank you for your graphical inspiration follow and buxo (since none of you provided any code).

-Fix: Sorter icon pointing down 'v' sorts in every window lowest value first, '^' highest value first
-CodeChange: move Dropdownlist from settings_gui.c to widget.c. More in place there.

1 files changed, 79 insertions, 0 deletions

diff --git a/vehicle_gui.h b/vehicle_gui.h
new file mode 100644
index 000000000..b6da5085f
--- /dev/null
+++ b/vehicle_gui.h
@@ -0,0 +1,79 @@
+#ifndef VEHICLE_GUI_H
+#define VEHICLE_GUI_H
+
+void DrawVehicleProfitButton(Vehicle *v, int x, int y);
+void InitializeVehiclesGuiList();
+
+/* sorter stuff */
+int CDECL GeneralOwnerSorter  (const void *a, const void *b);
+int CDECL VehicleNameSorter   (const void *a, const void *b);
+int CDECL GeneralVehicleSorter(const void *a, const void *b);
+VARDEF uint32	_internal_name_sorter_id;	// internal StringID for default vehicle-names
+VARDEF uint32	_last_vehicle_idx;				// cached index to hopefully speed up name-sorting
+VARDEF bool		_internal_sort_order;			// descending/ascending
+VARDEF byte		_internal_sort_type;			// Miscalleneous sorting criteria
+
+typedef struct SortStruct { // store owner through sorting process
+	uint32	index;
+	byte		owner;
+} SortStruct;
+
+#define PERIODIC_RESORT_DAYS 10
+
+enum VehicleSortListingTypes {
+ SORT_BY_UNSORTED											= 0,
+ SORT_BY_NUMBER												= 1,
+ SORT_BY_NAME													= 2,
+ SORT_BY_AGE													= 3,
+ SORT_BY_PROFIT_THIS_YEAR							= 4,
+ SORT_BY_PROFIT_LAST_YEAR							= 5,
+ SORT_BY_TOTAL_CAPACITY_PER_CARGOTYPE	= 6,
+ SORT_BY_RELIABILITY									= 7,
+ SORT_BY_MAX_SPEED										= 8
+};
+
+static const uint16 _vehicle_sort_listing[] = {
+	STR_SORT_BY_UNSORTED,
+	STR_SORT_BY_NUMBER,
+	STR_SORT_BY_DROPDOWN_NAME,
+	STR_SORT_BY_AGE,
+	STR_SORT_BY_PROFIT_THIS_YEAR,
+	STR_SORT_BY_PROFIT_LAST_YEAR,
+	STR_SORT_BY_TOTAL_CAPACITY_PER_CARGOTYPE,
+	STR_SORT_BY_RELIABILITY,
+	STR_SORT_BY_MAX_SPEED,
+	INVALID_STRING_ID
+};
+
+enum VehicleSortTypes {
+	VEHTRAIN		= 0,
+	VEHROAD			= 1,
+	VEHSHIP			= 2,
+	VEHAIRCRAFT	= 3
+};
+
+VARDEF bool _vehicle_sort_dirty[4];	// global sort, vehicles added/removed (4 types of vehicles)
+
+VARDEF bool _train_sort_dirty[MAX_PLAYERS];			// vehicles for a given player needs to be resorted (new criteria)
+VARDEF byte _train_sort_type[MAX_PLAYERS];			// different criteria for sorting
+VARDEF bool _train_sort_order[MAX_PLAYERS];			// sort descending/ascending
+
+VARDEF bool _aircraft_sort_dirty[MAX_PLAYERS];	// vehicles for a given player needs to be resorted (new criteria)
+VARDEF byte _aircraft_sort_type[MAX_PLAYERS];		// different criteria for sorting
+VARDEF bool _aircraft_sort_order[MAX_PLAYERS];	// sort descending/ascending
+
+VARDEF bool _ship_sort_dirty[MAX_PLAYERS];			// vehicles for a given player needs to be resorted (new criteria)
+VARDEF byte _ship_sort_type[MAX_PLAYERS];				// different criteria for sorting
+VARDEF bool _ship_sort_order[MAX_PLAYERS];			// sort descending/ascending
+
+VARDEF bool _road_sort_dirty[MAX_PLAYERS];			// vehicles for a given player needs to be resorted (new criteria)
+VARDEF byte _road_sort_type[MAX_PLAYERS];				// different criteria for sorting
+VARDEF bool _road_sort_order[MAX_PLAYERS];			// sort descending/ascending
+
+enum {
+  PLY_WND_PRC__OFFSET_TOP_WIDGET	= 26,
+	PLY_WND_PRC__SIZE_OF_ROW_SMALL	= 26,
+  PLY_WND_PRC__SIZE_OF_ROW_BIG		= 36,
+};
+
+#endif /* VEHICLE_GUI_H */