(svn r6372) -Codechange: static, unneeded decleration in headers, superfluous header includes

-Codechange: Unify the Sorting struct both for vehicle-lists and network-lists.

1 files changed, 10 insertions, 14 deletions

diff --git a/window.h b/window.h
index 98cd797e4..865618c90 100644
--- a/window.h
+++ b/window.h
@@ -449,26 +449,22 @@ typedef struct {
 } scroller_d;
 assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(scroller_d));
 
-typedef enum VehicleListFlags {
+typedef enum SortListFlags {
 	VL_DESC    = 0x01,  // sort descending or ascending
 	VL_RESORT  = 0x02,  // instruct the code to resort the list in the next loop
 	VL_REBUILD = 0x04   // create sort-listing to use for qsort and friends
-} VehicleListFlags;
+} SortListFlags;
 
-typedef struct vehiclelist_d {
-	const Vehicle** sort_list;
-	uint16 list_length;
-	byte sort_type;
-	VehicleListFlags flags;
-	uint16 resort_timer;
-} vehiclelist_d;
-assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(vehiclelist_d));
+typedef struct Listing {
+	bool order;    // Ascending/descending
+	byte criteria; // Sorting criteria
+} Listing;
 
 typedef struct list_d {
-	uint16 list_length;    // length of the list being sorted
-	byte sort_type;        // what criteria to sort on
-	VehicleListFlags flags;// used to control sorting/resorting/etc.
-	uint16 resort_timer;   // resort list after a given amount of ticks if set
+	uint16 list_length;  // length of the list being sorted
+	byte sort_type;      // what criteria to sort on
+	SortListFlags flags; // used to control sorting/resorting/etc.
+	uint16 resort_timer; // resort list after a given amount of ticks if set
 } list_d;
 assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(list_d));