dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r13045) -Codechange: make list_d (now GUIList) more generic and uniform.

Browse Source
This commit is contained in:
rubidium
2008-05-11 14:23:45 +00:00
parent 568464aa96
commit 75e3792aa3
5 changed files with 177 additions and 188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/window_gui.h
View File

@@ -557,7 +557,6 @@ enum SortListFlags {
VL_REBUILD = 1 << 2, ///< create sort-listing to use for qsort and friends
VL_END = 1 << 3,
};
DECLARE_ENUM_AS_BIT_SET(SortListFlags);
struct Listing {
@@ -565,22 +564,14 @@ struct Listing {
byte criteria; ///< Sorting criteria
};
struct list_d {
uint16 list_length; ///< length of the list being sorted
byte sort_type; ///< what criteria to sort on
template <typename T>
struct GUIList {
T* sort_list; ///< The items to sort.
SortListFlags flags; ///< used to control sorting/resorting/etc.
uint16 list_length; ///< length of the list being sorted
uint16 resort_timer; ///< resort list after a given amount of ticks if set
byte sort_type; ///< what criteria to sort on
};
assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(list_d));
struct vehiclelist_d {
const Vehicle** sort_list; // List of vehicles (sorted)
Listing *_sorting; // pointer to the appropiate subcategory of _sorting
uint16 length_of_sort_list; // Keeps track of how many vehicle pointers sort list got space for
VehicleType vehicle_type; // The vehicle type that is sorted
list_d l; // General list struct
};
assert_compile(WINDOW_CUSTOM_SIZE >= sizeof(vehiclelist_d));
/****************** THESE ARE NOT WIDGET TYPES!!!!! *******************/
enum WindowWidgetBehaviours {