diff options
| author | tron <tron@openttd.org> | 2004-11-25 06:05:47 +0000 |
|---|---|---|
| committer | tron <tron@openttd.org> | 2004-11-25 06:05:47 +0000 |
| commit | b07357373fb3eee283758af8f5376ec8e5bd5426 (patch) | |
| tree | 09d8755ee0352625d309086b596276a9fb3183e6 | |
| parent | e35a0b1c4437905648f3ea8e08924c8f6a658afe (diff) | |
| download | openttd-b07357373fb3eee283758af8f5376ec8e5bd5426.tar.xz | |
(svn r813) Push two tables from vehicle_gui.h into vehicle_gui.c - they were in the binary 48 (!) times.
While here change the type for one table from uint16 to StringID.
| -rw-r--r-- | vehicle_gui.c | 25 | ||||
| -rw-r--r-- | vehicle_gui.h | 27 |
2 files changed, 27 insertions, 25 deletions
diff --git a/vehicle_gui.c b/vehicle_gui.c index 5d0536d76..2b3e27916 100644 --- a/vehicle_gui.c +++ b/vehicle_gui.c @@ -3,6 +3,31 @@ #include "vehicle.h" +VehicleSortListingTypeFunctions * const _vehicle_sorter[] = { + &VehicleUnsortedSorter, + &VehicleNumberSorter, + &VehicleNameSorter, + &VehicleAgeSorter, + &VehicleProfitThisYearSorter, + &VehicleProfitLastYearSorter, + &VehicleCargoSorter, + &VehicleReliabilitySorter, + &VehicleMaxSpeedSorter +}; + +const StringID _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 +}; + /* General Vehicle GUI based procedures that are independent of vehicle types */ void InitializeVehiclesGuiList() { diff --git a/vehicle_gui.h b/vehicle_gui.h index 0ca135500..3883967f0 100644 --- a/vehicle_gui.h +++ b/vehicle_gui.h @@ -31,32 +31,9 @@ DEF_SORTER(VehicleMaxSpeedSorter); typedef DEF_SORTER(VehicleSortListingTypeFunctions); -static VehicleSortListingTypeFunctions * const _vehicle_sorter[] = { - &VehicleUnsortedSorter, - &VehicleNumberSorter, - &VehicleNameSorter, - &VehicleAgeSorter, - &VehicleProfitThisYearSorter, - &VehicleProfitLastYearSorter, - &VehicleCargoSorter, - &VehicleReliabilitySorter, - &VehicleMaxSpeedSorter -}; - #define SORT_BY_UNSORTED 0 - -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 -}; +extern VehicleSortListingTypeFunctions * const _vehicle_sorter[]; +extern const StringID _vehicle_sort_listing[]; enum VehicleSortTypes { VEHTRAIN = 0, |