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

(svn r6372) -Codechange: static, unneeded decleration in headers, superfluous header includes

Browse Source 
-Codechange: Unify the Sorting struct both for vehicle-lists and network-lists.
This commit is contained in:
Darkvater
2006-09-03 23:27:38 +00:00
parent e42d819b6a
commit 794cc6d55e
4 changed files with 43 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
vehicle_gui.h
View File

@@ -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 */