From eb9a2dd3f602dce13a74489f6cf2672cb4c57472 Mon Sep 17 00:00:00 2001 From: Darkvater Date: Sun, 3 Sep 2006 23:27:38 +0000 Subject: (svn r6372) -Codechange: static, unneeded decleration in headers, superfluous header includes -Codechange: Unify the Sorting struct both for vehicle-lists and network-lists. --- vehicle_gui.h | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) (limited to 'vehicle_gui.h') diff --git a/vehicle_gui.h b/vehicle_gui.h index 29bbf32c6..ed9efeb0b 100644 --- a/vehicle_gui.h +++ b/vehicle_gui.h @@ -3,12 +3,8 @@ #ifndef VEHICLE_GUI_H #define VEHICLE_GUI_H -#include "station.h" -#include "vehicle.h" #include "window.h" -struct vehiclelist_d; - void DrawVehicleProfitButton(const Vehicle *v, int x, int y); CargoID DrawVehicleRefitWindow(const Vehicle *v, int sel); void InitializeVehiclesGuiList(void); @@ -19,20 +15,6 @@ void ResortVehicleLists(void); #define PERIODIC_RESORT_DAYS 10 -typedef struct Listing { - bool order; // Ascending/descending? - byte criteria; // Sorting criteria -} Listing; - -typedef struct Sorting { - Listing aircraft; - Listing roadveh; - Listing ship; - Listing train; -} Sorting; - -extern Sorting _sorting; - enum { PLY_WND_PRC__OFFSET_TOP_WIDGET = 26, PLY_WND_PRC__SIZE_OF_ROW_SMALL = 26, @@ -54,8 +36,6 @@ static inline bool ValidVLWFlags(uint16 flags) void PlayerVehWndProc(Window *w, WindowEvent *e); -void ShowReplaceVehicleWindow(byte vehicletype); - void DrawTrainEnginePurchaseInfo(int x, int y, EngineID engine_number); void DrawTrainWagonPurchaseInfo(int x, int y, EngineID engine_number); void DrawRoadVehPurchaseInfo(int x, int y, EngineID engine_number); @@ -66,17 +46,16 @@ void DrawTrainImage(const Vehicle *v, int x, int y, int count, int skip, Vehicle void DrawRoadVehImage(const Vehicle *v, int x, int y, VehicleID selection); void DrawShipImage(const Vehicle *v, int x, int y, VehicleID selection); void DrawSmallOrderListShip(const Vehicle *v, int x, int y); +void DrawAircraftImage(const Vehicle *v, int x, int y, VehicleID selection); +void DrawSmallOrderListAircraft(const Vehicle *v, int x, int y); void ShowBuildTrainWindow(TileIndex tile); void ShowBuildRoadVehWindow(TileIndex tile); void ShowBuildShipWindow(TileIndex tile); void ShowBuildAircraftWindow(TileIndex tile); -void DrawAircraftImage(const Vehicle *v, int x, int y, VehicleID selection); -void DrawSmallOrderListAircraft(const Vehicle *v, int x, int y); - void ChangeVehicleViewWindow(const Vehicle *from_v, const Vehicle *to_v); -int ShowAdditionalText(int x, int y, int w, EngineID engine_number); +int ShowAdditionalText(int x, int y, int w, EngineID engine); #endif /* VEHICLE_GUI_H */ -- cgit v1.2.3-54-g00ecf