diff options
| author | tron <tron@openttd.org> | 2006-08-31 13:33:25 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2006-08-31 13:33:25 +0000 |
| commit | 7acc9ea1a743ad2c93c7de04321885c4d01816b5 (patch) | |
| tree | d3f27206e9b168b521beb38e875d3a42eed6cba1 /vehicle_gui.c | |
| parent | c471ddf4b69579a9e05eafe1b4156c7012cc89d7 (diff) | |
| download | openttd-7acc9ea1a743ad2c93c7de04321885c4d01816b5.tar.xz | |
(svn r6270) Remove the "unsorted" vehicle sorter, because it's plain useless
Diffstat (limited to 'vehicle_gui.c')
| -rw-r--r-- | vehicle_gui.c | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/vehicle_gui.c b/vehicle_gui.c index 895581a6d..ed4753109 100644 --- a/vehicle_gui.c +++ b/vehicle_gui.c @@ -40,7 +40,6 @@ static RailType _railtype_selected_in_replace_gui; typedef int CDECL VehicleSortListingTypeFunction(const void*, const void*); -static VehicleSortListingTypeFunction VehicleUnsortedSorter; static VehicleSortListingTypeFunction VehicleNumberSorter; static VehicleSortListingTypeFunction VehicleNameSorter; static VehicleSortListingTypeFunction VehicleAgeSorter; @@ -53,7 +52,6 @@ static VehicleSortListingTypeFunction VehicleModelSorter; static VehicleSortListingTypeFunction VehicleValueSorter; static VehicleSortListingTypeFunction* const _vehicle_sorter[] = { - &VehicleUnsortedSorter, &VehicleNumberSorter, &VehicleNameSorter, &VehicleAgeSorter, @@ -66,8 +64,7 @@ static VehicleSortListingTypeFunction* const _vehicle_sorter[] = { &VehicleValueSorter, }; -const StringID _vehicle_sort_listing[] = { - STR_SORT_BY_UNSORTED, +static const StringID _vehicle_sort_listing[] = { STR_SORT_BY_NUMBER, STR_SORT_BY_DROPDOWN_NAME, STR_SORT_BY_AGE, @@ -295,10 +292,6 @@ int ShowAdditionalText(int x, int y, int w, EngineID engine) * 3. (uint32)_internal_name_sorter_id: default StringID of the vehicle when no name is set. eg * STR_SV_TRAIN_NAME for trains or STR_SV_AIRCRAFT_NAME for aircraft */ -static int CDECL VehicleUnsortedSorter(const void *a, const void *b) -{ - return (*(const Vehicle**)a)->index - (*(const Vehicle**)b)->index; -} // if the sorting criteria had the same value, sort vehicle by unitnumber #define VEHICLEUNITNUMBERSORTER(r, a, b) {if (r == 0) {r = a->unitnumber - b->unitnumber;}} @@ -1236,9 +1229,6 @@ void PlayerVehWndProc(Window *w, WindowEvent *e) SortVehicleList(vl); SetVScrollCount(w, vl->list_length); - // disable 'Sort By' tooltip on Unsorted sorting criteria - if (vl->sort_type == SORT_BY_UNSORTED) SETBIT(w->disabled_state, 3); - /* draw the widgets */ switch (window_type) { case VLW_SHARED_ORDERS: @@ -1456,8 +1446,6 @@ void PlayerVehWndProc(Window *w, WindowEvent *e) case VEH_Aircraft: _sorting.aircraft.criteria = vl->sort_type; break; default: NOT_REACHED(); break; } - // enable 'Sort By' if a sorter criteria is chosen - if (vl->sort_type != SORT_BY_UNSORTED) CLRBIT(w->disabled_state, 3); } SetWindowDirty(w); break; |