From 32c2041f891b451d66a72871986871c46b6f8263 Mon Sep 17 00:00:00 2001 From: skidd13 Date: Thu, 19 Jun 2008 19:58:30 +0000 Subject: (svn r13587) -Codechange: make some globals members of VehicleListBase since they are used as such -Cleanup: some small things referring the change --- src/vehicle_gui.h | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'src/vehicle_gui.h') diff --git a/src/vehicle_gui.h b/src/vehicle_gui.h index aea010a84..43a99c919 100644 --- a/src/vehicle_gui.h +++ b/src/vehicle_gui.h @@ -15,10 +15,6 @@ void DrawVehicleProfitButton(const Vehicle *v, int x, int y); void ShowVehicleRefitWindow(const Vehicle *v, VehicleOrderID order); -#define PERIODIC_RESORT_DAYS 10 - -extern const StringID _vehicle_sort_listing[]; - /** Constants of vehicle view widget indices */ enum VehicleViewWindowWidgets { VVW_WIDGET_CLOSEBOX = 0, @@ -121,6 +117,14 @@ struct VehicleListBase { GUIVehicleList vehicles; ///< The list of vehicles Listing *sorting; ///< Pointer to the vehicle type related sorting. VehicleType vehicle_type; ///< The vehicle type that is sorted + + static const StringID vehicle_sorter_names[]; + static GUIVehicleList::SortFunction *const vehicle_sorter_funcs[]; + + VehicleListBase() + { + this->vehicles.SetSortFuncs(this->vehicle_sorter_funcs); + } }; struct Sorting { -- cgit v1.2.3-54-g00ecf