openttd-mini: comparison src/openttd.h

equal deleted inserted replaced

-:7d81e3a5d803
+:e4a2ed7e5613
 #endif
 #include "hal.h"
 #include "helpers.hpp"
-typedef struct Oblong {
+struct Oblong {
 	int x, y;
 	int width, height;
-} Oblong;
+};
-typedef struct BoundingRect {
+struct BoundingRect {
 	int width;
 	int height;
-} BoundingRect;
+};
-typedef struct Pair {
+struct Pair {
 	int a;
 	int b;
-} Pair;
+};
 #include "map.h"
 #include "slope.h"
 // Forward declarations of structs.
-typedef struct Vehicle Vehicle;
+struct Vehicle;
-typedef struct Depot Depot;
+struct Depot;
-typedef struct Waypoint Waypoint;
+struct Waypoint;
-typedef struct Window Window;
+struct Window;
-typedef struct Station Station;
+struct Station;
-typedef struct ViewPort ViewPort;
+struct ViewPort;
-typedef struct Town Town;
+struct Town;
-typedef struct NewsItem NewsItem;
+struct NewsItem;
-typedef struct Industry Industry;
+struct Industry;
-typedef struct DrawPixelInfo DrawPixelInfo;
+struct DrawPixelInfo;
 typedef byte VehicleOrderID;  ///< The index of an order within its current vehicle (not pool related)
 typedef byte CargoID;
 typedef byte LandscapeID;
 typedef uint32 SpriteID;      ///< The number of a sprite, without mapping bits and colortables
-typedef struct PalSpriteID {
+struct PalSpriteID {
 	SpriteID sprite;
 	SpriteID pal;
-} PalSpriteID;
+};
 typedef uint16 EngineID;
 typedef uint16 UnitID;
 typedef uint16 StringID;
 typedef EngineID *EngineList; ///< engine list type placeholder acceptable for C code (see helpers.cpp)
 template <> struct EnumPropsT<Owner> : MakeEnumPropsT<Owner, byte, OWNER_BEGIN, OWNER_END, INVALID_OWNER> {};
 typedef TinyEnumT<Owner> OwnerByte;
 typedef OwnerByte PlayerByte;
-typedef enum TransportTypes {
+enum TransportType {
 	/* These constants are for now linked to the representation of bridges
 	 * and tunnels, so they can be used by GetTileTrackStatus_TunnelBridge.
 	 * In an ideal world, these constants would be used everywhere when
 	 * accessing tunnels and bridges. For now, you should just not change
 	 * the values for road and rail.
 	TRANSPORT_RAIL = 0,
 	TRANSPORT_ROAD = 1,
 	TRANSPORT_WATER, // = 2
 	TRANSPORT_END,
 	INVALID_TRANSPORT = 0xff,
-} TransportType;
+};
 /** Define basic enum properties */
 template <> struct EnumPropsT<TransportType> : MakeEnumPropsT<TransportType, byte, TRANSPORT_BEGIN, TRANSPORT_END, INVALID_TRANSPORT> {};
 typedef TinyEnumT<TransportType> TransportTypeByte;
-typedef struct TileInfo {
+struct TileInfo {
 	uint x;
 	uint y;
 	Slope tileh;
 	TileIndex tile;
 	uint z;
-} TileInfo;
+};
 /* Display Options */
 enum {
 	DO_SHOW_TOWN_NAMES    = 1 << 0,
 enum {
 	NUM_PRICES = 49,
 };
-typedef struct Prices {
+struct Prices {
 	int32 station_value;
 	int32 build_rail;
 	int32 build_road;
 	int32 build_signals;
 	int32 build_bridge;
 	int32 running_rail[3];
 	int32 aircraft_running;
 	int32 roadveh_running;
 	int32 ship_running;
 	int32 build_industry;
-} Prices;
+};
 #define GAME_DIFFICULTY_NUM 18
-typedef struct GameDifficulty {
+struct GameDifficulty {
 	int max_no_competitors;
 	int competitor_start_time;
 	int number_towns;
 	int number_industries;
 	int max_loan;
 	int quantity_sea_lakes;
 	int economy;
 	int line_reverse_mode;
 	int disasters;
 	int town_council_tolerance; // minimum required town ratings to be allowed to demolish stuff
-} GameDifficulty;
+};
 enum {
 	// Temperate
 	CT_PASSENGERS   =  0,
 	CT_COAL         =  1,
 	CT_INVALID      = 0xFF
 };
 typedef uint AcceptedCargo[NUM_CARGO];
-typedef struct TileDesc {
+struct TileDesc {
 	StringID str;
 	Owner owner;
 	Date build_date;
 	uint32 dparam[2];
-} TileDesc;
+};
-typedef struct {
+struct ViewportSign {
 	int32 left;
 	int32 top;
 	byte width_1, width_2;
-} ViewportSign;
+};
 typedef void DrawTileProc(TileInfo *ti);
 typedef uint GetSlopeZProc(TileIndex tile, uint x, uint y);
 typedef int32 ClearTileProc(TileIndex tile, byte flags);
 typedef void ChangeTileOwnerProc(TileIndex tile, PlayerID old_player, PlayerID new_player);
 /** @see VehicleEnterTileStatus to see what the return values mean */
 typedef uint32 VehicleEnterTileProc(Vehicle *v, TileIndex tile, int x, int y);
 typedef Slope GetSlopeTilehProc(TileIndex, Slope tileh);
-typedef struct {
+struct TileTypeProcs {
 	DrawTileProc *draw_tile_proc;
 	GetSlopeZProc *get_slope_z_proc;
 	ClearTileProc *clear_tile_proc;
 	GetAcceptedCargoProc *get_accepted_cargo_proc;
 	GetTileDescProc *get_tile_desc_proc;
 	TileLoopProc *tile_loop_proc;
 	ChangeTileOwnerProc *change_tile_owner_proc;
 	GetProducedCargoProc *get_produced_cargo_proc;
 	VehicleEnterTileProc *vehicle_enter_tile_proc;
 	GetSlopeTilehProc *get_slope_tileh_proc;
-} TileTypeProcs;
+};
 enum WindowClass {
 	WC_NONE,
 	WC_MAIN_WINDOW = WC_NONE,
 VARDEF byte _no_scroll;
 /** To have a concurrently running thread interface with the main program, use
 * the OTTD_SendThreadMessage() function. Actions to perform upon the message are handled
 * in the ProcessSentMessage() function */
-typedef enum ThreadMsgs {
+enum ThreadMsg {
 	MSG_OTTD_NO_MESSAGE,
 	MSG_OTTD_SAVETHREAD_DONE,
 	MSG_OTTD_SAVETHREAD_ERROR,
-} ThreadMsg;
+};
 void OTTD_SendThreadMessage(ThreadMsg msg);
 #endif /* OPENTTD_H */

changeset 6248	e4a2ed7e5613
parent 5991	ec2eebfe86de
child 6357	f0f5e7d1713c