From 53aaabe6e9aebdca71608e2996a9ecbff8b73713 Mon Sep 17 00:00:00 2001 From: smatz Date: Tue, 23 Mar 2010 22:25:43 +0000 Subject: [PATCH] (svn r19507) -Codechange: remove semicolon after DECLARE_POSTFIX_INCREMENT and DECLARE_ENUM_AS_BIT_SET --- src/ai/api/ai_company.hpp | 2 +- src/ai/api/ai_order.hpp | 2 +- src/ai/api/ai_station.hpp | 2 +- src/ai/api/ai_waypoint.hpp | 2 +- src/bridge.h | 2 +- src/command_type.h | 2 +- src/company_manager_face.h | 4 ++-- src/company_type.h | 2 +- src/direction_type.h | 6 +++--- src/driver.h | 2 +- src/economy_type.h | 2 +- src/fileio_type.h | 2 +- src/gfx_func.h | 2 +- src/gfx_type.h | 4 ++-- src/industrytype.h | 4 ++-- src/livery.h | 2 +- src/network/network.cpp | 2 +- src/newgrf.h | 2 +- src/newgrf_airport.h | 2 +- src/newgrf_station.h | 2 +- src/news_type.h | 2 +- src/openttd.h | 2 +- src/order_type.h | 2 +- src/pathfinder/yapf/yapf_node_rail.hpp | 2 +- src/rail.h | 2 +- src/rail_type.h | 4 ++-- src/road_gui.cpp | 2 +- src/road_map.h | 2 +- src/road_type.h | 6 +++--- src/saveload/oldloader.h | 2 +- src/settings_internal.h | 2 +- src/sortlist_type.h | 2 +- src/station_type.h | 4 ++-- src/subsidy_type.h | 2 +- src/table/strgen_tables.h | 2 +- src/table/townname.h | 4 ++-- src/tile_cmd.h | 2 +- src/tilehighlight_type.h | 2 +- src/town.h | 2 +- src/track_type.h | 6 +++--- src/vehicle_type.h | 2 +- src/viewport_type.h | 2 +- src/widget_type.h | 4 ++-- src/window_gui.h | 2 +- 44 files changed, 57 insertions(+), 57 deletions(-) diff --git a/src/ai/api/ai_company.hpp b/src/ai/api/ai_company.hpp index d32579ef8e..d8e958dfa7 100644 --- a/src/ai/api/ai_company.hpp +++ b/src/ai/api/ai_company.hpp @@ -230,6 +230,6 @@ public: static uint32 GetAutoRenewMoney(CompanyID company); }; -DECLARE_POSTFIX_INCREMENT(AICompany::CompanyID); +DECLARE_POSTFIX_INCREMENT(AICompany::CompanyID) #endif /* AI_COMPANY_HPP */ diff --git a/src/ai/api/ai_order.hpp b/src/ai/api/ai_order.hpp index ae9ea6f882..f13b164bd7 100644 --- a/src/ai/api/ai_order.hpp +++ b/src/ai/api/ai_order.hpp @@ -503,6 +503,6 @@ public: */ static bool UnshareOrders(VehicleID vehicle_id); }; -DECLARE_ENUM_AS_BIT_SET(AIOrder::AIOrderFlags); +DECLARE_ENUM_AS_BIT_SET(AIOrder::AIOrderFlags) #endif /* AI_ORDER_HPP */ diff --git a/src/ai/api/ai_station.hpp b/src/ai/api/ai_station.hpp index 7a996490f9..79ad99537f 100644 --- a/src/ai/api/ai_station.hpp +++ b/src/ai/api/ai_station.hpp @@ -156,6 +156,6 @@ public: static TownID GetNearestTown(StationID station_id); }; -DECLARE_ENUM_AS_BIT_SET(AIStation::StationType); +DECLARE_ENUM_AS_BIT_SET(AIStation::StationType) #endif /* AI_STATION_HPP */ diff --git a/src/ai/api/ai_waypoint.hpp b/src/ai/api/ai_waypoint.hpp index ddd6168d58..32b1da4987 100644 --- a/src/ai/api/ai_waypoint.hpp +++ b/src/ai/api/ai_waypoint.hpp @@ -71,6 +71,6 @@ public: static bool HasWaypointType(StationID waypoint_id, WaypointType waypoint_type); }; -DECLARE_ENUM_AS_BIT_SET(AIWaypoint::WaypointType); +DECLARE_ENUM_AS_BIT_SET(AIWaypoint::WaypointType) #endif /* AI_WAYPOINT_HPP */ diff --git a/src/bridge.h b/src/bridge.h index b65d4e8299..4916e2484a 100644 --- a/src/bridge.h +++ b/src/bridge.h @@ -30,7 +30,7 @@ enum BridgePieces { BRIDGE_PIECE_INVALID, }; -DECLARE_POSTFIX_INCREMENT(BridgePieces); +DECLARE_POSTFIX_INCREMENT(BridgePieces) enum { MAX_BRIDGES = 13 diff --git a/src/command_type.h b/src/command_type.h index a9827f68dc..1f7c817feb 100644 --- a/src/command_type.h +++ b/src/command_type.h @@ -303,7 +303,7 @@ enum DoCommandFlag { DC_ALL_TILES = 0x100, ///< allow this command also on MP_VOID tiles DC_NO_MODIFY_TOWN_RATING = 0x200, ///< do not change town rating }; -DECLARE_ENUM_AS_BIT_SET(DoCommandFlag); +DECLARE_ENUM_AS_BIT_SET(DoCommandFlag) /** * Used to combine a StringID with the command. diff --git a/src/company_manager_face.h b/src/company_manager_face.h index 46a1ac9e80..5e68aa27cd 100644 --- a/src/company_manager_face.h +++ b/src/company_manager_face.h @@ -28,7 +28,7 @@ enum GenderEthnicity { GE_BF = 1 << ETHNICITY_BLACK | 1 << GENDER_FEMALE, ///< A female of African origin (black) GE_END, }; -DECLARE_ENUM_AS_BIT_SET(GenderEthnicity); ///< See GenderRace as a bitset +DECLARE_ENUM_AS_BIT_SET(GenderEthnicity) ///< See GenderRace as a bitset /** Bitgroups of the CompanyManagerFace variable */ enum CompanyManagerFaceVariable { @@ -52,7 +52,7 @@ enum CompanyManagerFaceVariable { CMFV_GLASSES, CMFV_END }; -DECLARE_POSTFIX_INCREMENT(CompanyManagerFaceVariable); +DECLARE_POSTFIX_INCREMENT(CompanyManagerFaceVariable) /** Information about the valid values of CompanyManagerFace bitgroups as well as the sprites to draw */ struct CompanyManagerFaceBitsInfo { diff --git a/src/company_type.h b/src/company_type.h index 11da3ddaed..a40a16ac0b 100644 --- a/src/company_type.h +++ b/src/company_type.h @@ -35,7 +35,7 @@ enum Owner { COMPANY_NEW_COMPANY = 254, ///< The client wants a new company COMPANY_SPECTATOR = 255, ///< The client is spectating }; -DECLARE_POSTFIX_INCREMENT(Owner); +DECLARE_POSTFIX_INCREMENT(Owner) enum { MAX_LENGTH_PRESIDENT_NAME_BYTES = 31, ///< The maximum length of a president name in bytes including '\0' diff --git a/src/direction_type.h b/src/direction_type.h index 89197e36b2..1a6ab996c9 100644 --- a/src/direction_type.h +++ b/src/direction_type.h @@ -38,7 +38,7 @@ enum Direction { }; /** Allow incrementing of Direction variables */ -DECLARE_POSTFIX_INCREMENT(Direction); +DECLARE_POSTFIX_INCREMENT(Direction) /** Define basic enum properties */ template <> struct EnumPropsT : MakeEnumPropsT {}; @@ -88,7 +88,7 @@ enum DiagDirection { }; /** Allow incrementing of DiagDirection variables */ -DECLARE_POSTFIX_INCREMENT(DiagDirection); +DECLARE_POSTFIX_INCREMENT(DiagDirection) /** Define basic enum properties */ template <> struct EnumPropsT : MakeEnumPropsT {}; @@ -113,7 +113,7 @@ enum DiagDirDiff { }; /** Allow incrementing of DiagDirDiff variables */ -DECLARE_POSTFIX_INCREMENT(DiagDirDiff); +DECLARE_POSTFIX_INCREMENT(DiagDirDiff) /** diff --git a/src/driver.h b/src/driver.h index 6b4ae7bc6d..0f17ee3c15 100644 --- a/src/driver.h +++ b/src/driver.h @@ -40,7 +40,7 @@ public: virtual const char *GetName() const = 0; }; -DECLARE_POSTFIX_INCREMENT(Driver::Type); +DECLARE_POSTFIX_INCREMENT(Driver::Type) class DriverFactoryBase { diff --git a/src/economy_type.h b/src/economy_type.h index 44227a97df..a9e3ecee33 100644 --- a/src/economy_type.h +++ b/src/economy_type.h @@ -51,7 +51,7 @@ enum ScoreID { SCORE_MAX = 1000 ///< The max score that can be in the performance history /* the scores together of score_info is allowed to be more! */ }; -DECLARE_POSTFIX_INCREMENT(ScoreID); +DECLARE_POSTFIX_INCREMENT(ScoreID) struct ScoreInfo { byte id; ///< Unique ID of the score diff --git a/src/fileio_type.h b/src/fileio_type.h index c4af232be4..66c02be6b1 100644 --- a/src/fileio_type.h +++ b/src/fileio_type.h @@ -47,6 +47,6 @@ enum Searchpath { NUM_SEARCHPATHS }; -DECLARE_POSTFIX_INCREMENT(Searchpath); +DECLARE_POSTFIX_INCREMENT(Searchpath) #endif /* FILEIO_TYPE_H */ diff --git a/src/gfx_func.h b/src/gfx_func.h index 5f7bee2fae..0f05f39d0f 100644 --- a/src/gfx_func.h +++ b/src/gfx_func.h @@ -102,7 +102,7 @@ enum StringAlignment { SA_FORCE = 4, ///< Force the alignment, i.e. don't swap for RTL languages. SA_STRIP = 8, ///< Strip the SETX/SETXY commands from the string }; -DECLARE_ENUM_AS_BIT_SET(StringAlignment); +DECLARE_ENUM_AS_BIT_SET(StringAlignment) int DrawString(int left, int right, int top, const char *str, TextColour colour = TC_FROMSTRING, StringAlignment align = SA_LEFT, bool underline = false); int DrawString(int left, int right, int top, StringID str, TextColour colour = TC_FROMSTRING, StringAlignment align = SA_LEFT, bool underline = false); diff --git a/src/gfx_type.h b/src/gfx_type.h index 968c0c993b..8bb9c3ff47 100644 --- a/src/gfx_type.h +++ b/src/gfx_type.h @@ -165,7 +165,7 @@ enum FontSize { FS_BEGIN = FS_NORMAL, ///< First font. }; -DECLARE_POSTFIX_INCREMENT(FontSize); +DECLARE_POSTFIX_INCREMENT(FontSize) /** * Used to only draw a part of the sprite. @@ -221,7 +221,7 @@ enum TextColour { IS_PALETTE_COLOUR = 0x100, ///< colour value is already a real palette colour index, not an index of a StringColour }; -DECLARE_ENUM_AS_BIT_SET(TextColour); +DECLARE_ENUM_AS_BIT_SET(TextColour) /** Defines a few values that are related to animations using palette changes */ enum PaletteAnimationSizes { diff --git a/src/industrytype.h b/src/industrytype.h index f454836341..b4d653c536 100644 --- a/src/industrytype.h +++ b/src/industrytype.h @@ -81,14 +81,14 @@ enum IndustryBehaviour { INDUSTRYBEH_NOBUILT_MAPCREATION = 1 << 16, ///< Do not force one instance of this type to appear on map generation INDUSTRYBEH_CANCLOSE_LASTINSTANCE = 1 << 17, ///< Allow closing down the last instance of this type }; -DECLARE_ENUM_AS_BIT_SET(IndustryBehaviour); +DECLARE_ENUM_AS_BIT_SET(IndustryBehaviour) /** Flags for miscellaneous industry tile specialities */ enum IndustryTileSpecialFlags { INDTILE_SPECIAL_NONE = 0, INDTILE_SPECIAL_NEXTFRAME_RANDOMBITS = 1 << 0, ///< Callback 0x26 needs random bits }; -DECLARE_ENUM_AS_BIT_SET(IndustryTileSpecialFlags); +DECLARE_ENUM_AS_BIT_SET(IndustryTileSpecialFlags) struct IndustryTileTable { TileIndexDiffC ti; diff --git a/src/livery.h b/src/livery.h index df8029427f..79309d517a 100644 --- a/src/livery.h +++ b/src/livery.h @@ -54,7 +54,7 @@ enum LiveryScheme { LS_END }; -DECLARE_POSTFIX_INCREMENT(LiveryScheme); +DECLARE_POSTFIX_INCREMENT(LiveryScheme) /* List of different livery classes, used only by the livery GUI. */ enum LiveryClass { diff --git a/src/network/network.cpp b/src/network/network.cpp index 6d574cceba..b591e0ecd3 100644 --- a/src/network/network.cpp +++ b/src/network/network.cpp @@ -40,7 +40,7 @@ #endif /* DEBUG_DUMP_COMMANDS */ #include "table/strings.h" -DECLARE_POSTFIX_INCREMENT(ClientID); +DECLARE_POSTFIX_INCREMENT(ClientID) assert_compile(NetworkClientInfoPool::MAX_SIZE == NetworkClientSocketPool::MAX_SIZE); diff --git a/src/newgrf.h b/src/newgrf.h index 4f6b73acb2..22aa9652a1 100644 --- a/src/newgrf.h +++ b/src/newgrf.h @@ -29,7 +29,7 @@ enum GrfLoadingStage { GLS_END, }; -DECLARE_POSTFIX_INCREMENT(GrfLoadingStage); +DECLARE_POSTFIX_INCREMENT(GrfLoadingStage) enum GrfMiscBit { GMB_DESERT_TREES_FIELDS = 0, // Unsupported. diff --git a/src/newgrf_airport.h b/src/newgrf_airport.h index 004a7934f5..c2200918d1 100644 --- a/src/newgrf_airport.h +++ b/src/newgrf_airport.h @@ -36,7 +36,7 @@ enum AirportClassID { }; /** Allow incrementing of AirportClassID variables */ -DECLARE_POSTFIX_INCREMENT(AirportClassID); +DECLARE_POSTFIX_INCREMENT(AirportClassID) /** TTDP airport types. Used to map our types to TTDPatch's */ enum TTDPAirportType { diff --git a/src/newgrf_station.h b/src/newgrf_station.h index 84420c793b..0ccf0924f7 100644 --- a/src/newgrf_station.h +++ b/src/newgrf_station.h @@ -29,7 +29,7 @@ enum StationClassID { typedef SimpleTinyEnumT StationClassIDByte; /** Allow incrementing of StationClassID variables */ -DECLARE_POSTFIX_INCREMENT(StationClassID); +DECLARE_POSTFIX_INCREMENT(StationClassID) enum StationSpecFlags { SSF_SEPARATE_GROUND, ///< Use different sprite set for ground sprites. diff --git a/src/news_type.h b/src/news_type.h index 418334c73a..f179f55517 100644 --- a/src/news_type.h +++ b/src/news_type.h @@ -97,7 +97,7 @@ enum NewsFlag { NF_NO_TRANSPARENT = 1 << 1, ///< Bit value for disabling transparency. NF_SHADE = 1 << 2, ///< Bit value for enabling shading. }; -DECLARE_ENUM_AS_BIT_SET(NewsFlag); +DECLARE_ENUM_AS_BIT_SET(NewsFlag) /** diff --git a/src/openttd.h b/src/openttd.h index 35de45032a..fa96f5a97c 100644 --- a/src/openttd.h +++ b/src/openttd.h @@ -61,7 +61,7 @@ enum PauseMode { /* Pause mode bits when paused for network reasons */ PMB_PAUSED_NETWORK = PM_PAUSED_ACTIVE_CLIENTS | PM_PAUSED_JOIN, }; -DECLARE_ENUM_AS_BIT_SET(PauseMode); +DECLARE_ENUM_AS_BIT_SET(PauseMode) typedef SimpleTinyEnumT PauseModeByte; /** The current pause mode */ diff --git a/src/order_type.h b/src/order_type.h index 52940ba399..8c66d22961 100644 --- a/src/order_type.h +++ b/src/order_type.h @@ -103,7 +103,7 @@ enum OrderDepotActionFlags { ODATFB_HALT = 1 << 0, ///< Service the vehicle and then halt it. ODATFB_NEAREST_DEPOT = 1 << 1, ///< Send the vehicle to the nearest depot. }; -DECLARE_ENUM_AS_BIT_SET(OrderDepotActionFlags); +DECLARE_ENUM_AS_BIT_SET(OrderDepotActionFlags) /** * Variables (of a vehicle) to 'cause' skipping on. diff --git a/src/pathfinder/yapf/yapf_node_rail.hpp b/src/pathfinder/yapf/yapf_node_rail.hpp index 41ad8f8ff1..fa92706c6a 100644 --- a/src/pathfinder/yapf/yapf_node_rail.hpp +++ b/src/pathfinder/yapf/yapf_node_rail.hpp @@ -115,7 +115,7 @@ enum EndSegmentReasonBits { ESRB_ABORT_PF_MASK = ESRB_DEAD_END | ESRB_PATH_TOO_LONG | ESRB_INFINITE_LOOP | ESRB_FIRST_TWO_WAY_RED, }; -DECLARE_ENUM_AS_BIT_SET(EndSegmentReasonBits); +DECLARE_ENUM_AS_BIT_SET(EndSegmentReasonBits) inline CStrA ValueStr(EndSegmentReasonBits bits) { diff --git a/src/rail.h b/src/rail.h index f0a5ef609e..01af4f3697 100644 --- a/src/rail.h +++ b/src/rail.h @@ -27,7 +27,7 @@ enum RailTypeFlags { RTFB_NONE = 0, ///< All flags cleared. RTFB_CATENARY = 1 << RTF_CATENARY, ///< Value for drawing a catenary. }; -DECLARE_ENUM_AS_BIT_SET(RailTypeFlags); +DECLARE_ENUM_AS_BIT_SET(RailTypeFlags) struct SpriteGroup; diff --git a/src/rail_type.h b/src/rail_type.h index 1ad5d96986..9b0b34e4b0 100644 --- a/src/rail_type.h +++ b/src/rail_type.h @@ -41,7 +41,7 @@ enum RailType { }; /** Allow incrementing of Track variables */ -DECLARE_POSTFIX_INCREMENT(RailType); +DECLARE_POSTFIX_INCREMENT(RailType) /** Define basic enum properties */ template <> struct EnumPropsT : MakeEnumPropsT {}; typedef TinyEnumT RailTypeByte; @@ -57,6 +57,6 @@ enum RailTypes { RAILTYPES_MAGLEV = 1 << RAILTYPE_MAGLEV, ///< Ever fast maglev INVALID_RAILTYPES = UINT_MAX ///< Invalid railtypes }; -DECLARE_ENUM_AS_BIT_SET(RailTypes); +DECLARE_ENUM_AS_BIT_SET(RailTypes) #endif /* RAIL_TYPE_H */ diff --git a/src/road_gui.cpp b/src/road_gui.cpp index bacf1df852..029da1e2ea 100644 --- a/src/road_gui.cpp +++ b/src/road_gui.cpp @@ -51,7 +51,7 @@ enum RoadFlags { RF_START_HALFROAD_X = 0x08, // The start tile in X-dir should have only a half road RF_END_HALFROAD_X = 0x10, // The end tile in X-dir should have only a half road }; -DECLARE_ENUM_AS_BIT_SET(RoadFlags); +DECLARE_ENUM_AS_BIT_SET(RoadFlags) static RoadFlags _place_road_flag; diff --git a/src/road_map.h b/src/road_map.h index 46060ddfd6..e5e738cb4b 100644 --- a/src/road_map.h +++ b/src/road_map.h @@ -167,7 +167,7 @@ enum DisallowedRoadDirections { DRD_BOTH, ///< All directions are disallowed DRD_END }; -DECLARE_ENUM_AS_BIT_SET(DisallowedRoadDirections); +DECLARE_ENUM_AS_BIT_SET(DisallowedRoadDirections) /** * Gets the disallowed directions diff --git a/src/road_type.h b/src/road_type.h index 0379ba12b9..86ca4de783 100644 --- a/src/road_type.h +++ b/src/road_type.h @@ -26,7 +26,7 @@ enum RoadType { ROADTYPE_END, ///< Used for iterations INVALID_ROADTYPE = 0xFF ///< flag for invalid roadtype }; -DECLARE_POSTFIX_INCREMENT(RoadType); +DECLARE_POSTFIX_INCREMENT(RoadType) /** * The different roadtypes we support, but then a bitmask of them @@ -40,7 +40,7 @@ enum RoadTypes { ROADTYPES_END, ///< Used for iterations? INVALID_ROADTYPES = 0xFF ///< Invalid roadtypes }; -DECLARE_ENUM_AS_BIT_SET(RoadTypes); +DECLARE_ENUM_AS_BIT_SET(RoadTypes) typedef SimpleTinyEnumT RoadTypesByte; @@ -66,6 +66,6 @@ enum RoadBits { ROAD_ALL = ROAD_X | ROAD_Y ///< Full 4-way crossing }; -DECLARE_ENUM_AS_BIT_SET(RoadBits); +DECLARE_ENUM_AS_BIT_SET(RoadBits) #endif /* ROAD_TYPE_H */ diff --git a/src/saveload/oldloader.h b/src/saveload/oldloader.h index d1908e1364..b0f1688f28 100644 --- a/src/saveload/oldloader.h +++ b/src/saveload/oldloader.h @@ -84,7 +84,7 @@ enum OldChunkType { OC_END = 0 ///< End of the whole chunk, all 32 bits set to zero }; -DECLARE_ENUM_AS_BIT_SET(OldChunkType); +DECLARE_ENUM_AS_BIT_SET(OldChunkType) typedef bool OldChunkProc(LoadgameState *ls, int num); diff --git a/src/settings_internal.h b/src/settings_internal.h index 009e50f962..f97627aaca 100644 --- a/src/settings_internal.h +++ b/src/settings_internal.h @@ -49,7 +49,7 @@ enum SettingGuiFlagLong { SGF_SCENEDIT_TOO = 1 << 7, ///< this setting can be changed in the scenario editor (only makes sense when SGF_NEWGAME_ONLY is set) SGF_PER_COMPANY = 1 << 8, ///< this setting can be different for each company (saved in company struct) }; -DECLARE_ENUM_AS_BIT_SET(SettingGuiFlagLong); +DECLARE_ENUM_AS_BIT_SET(SettingGuiFlagLong) typedef SimpleTinyEnumT SettingGuiFlag; diff --git a/src/sortlist_type.h b/src/sortlist_type.h index 1c777d96f7..3347cb2583 100644 --- a/src/sortlist_type.h +++ b/src/sortlist_type.h @@ -29,7 +29,7 @@ enum SortListFlags { VL_FILTER = 1 << 4, ///< filter disabled/enabled VL_END = 1 << 5, }; -DECLARE_ENUM_AS_BIT_SET(SortListFlags); +DECLARE_ENUM_AS_BIT_SET(SortListFlags) /** Data structure describing how to show the list (what sort direction and criterium). */ struct Listing { diff --git a/src/station_type.h b/src/station_type.h index d14bd20940..d492371549 100644 --- a/src/station_type.h +++ b/src/station_type.h @@ -56,7 +56,7 @@ enum StationFacility { FACIL_DOCK = 1 << 4, ///< Station with a dock FACIL_WAYPOINT = 1 << 7, ///< Station is a waypoint }; -DECLARE_ENUM_AS_BIT_SET(StationFacility); +DECLARE_ENUM_AS_BIT_SET(StationFacility) typedef SimpleTinyEnumT StationFacilityByte; /** The vehicles that may have visited a station */ @@ -70,7 +70,7 @@ enum StationHadVehicleOfType { HVOT_WAYPOINT = 1 << 6, ///< Station is a waypoint (NewGRF only!) }; -DECLARE_ENUM_AS_BIT_SET(StationHadVehicleOfType); +DECLARE_ENUM_AS_BIT_SET(StationHadVehicleOfType) typedef SimpleTinyEnumT StationHadVehicleOfTypeByte; /** The different catchment areas used */ diff --git a/src/subsidy_type.h b/src/subsidy_type.h index e3e6b2d690..d4b2f68ecb 100644 --- a/src/subsidy_type.h +++ b/src/subsidy_type.h @@ -21,7 +21,7 @@ enum PartOfSubsidy { }; typedef SimpleTinyEnumT PartOfSubsidyByte; -DECLARE_ENUM_AS_BIT_SET(PartOfSubsidy); +DECLARE_ENUM_AS_BIT_SET(PartOfSubsidy) typedef uint16 SubsidyID; ///< ID of a subsidy struct Subsidy; diff --git a/src/table/strgen_tables.h b/src/table/strgen_tables.h index 40a1b7fa35..3e95246c0c 100644 --- a/src/table/strgen_tables.h +++ b/src/table/strgen_tables.h @@ -17,7 +17,7 @@ enum CmdFlags { C_CASE = 0x2, ///< These commands support cases C_GENDER = 0x4, ///< These commands support genders }; -DECLARE_ENUM_AS_BIT_SET(CmdFlags); +DECLARE_ENUM_AS_BIT_SET(CmdFlags) typedef void (*ParseCmdProc)(char *buf, int value); diff --git a/src/table/townname.h b/src/table/townname.h index 389530081b..8ecd8f8031 100644 --- a/src/table/townname.h +++ b/src/table/townname.h @@ -1738,7 +1738,7 @@ enum CzechAllow { CZA_ALL = ~0 }; -DECLARE_ENUM_AS_BIT_SET(CzechAllow); +DECLARE_ENUM_AS_BIT_SET(CzechAllow) /* All these flags must be satisfied (in the stem->others direction): */ enum CzechChoose { @@ -1749,7 +1749,7 @@ enum CzechChoose { CZC_ANY = ~0 }; -DECLARE_ENUM_AS_BIT_SET(CzechChoose); +DECLARE_ENUM_AS_BIT_SET(CzechChoose) struct CzechNameSubst { CzechGender gender; diff --git a/src/tile_cmd.h b/src/tile_cmd.h index a5ea8b9a78..7e7cc45004 100644 --- a/src/tile_cmd.h +++ b/src/tile_cmd.h @@ -38,7 +38,7 @@ enum VehicleEnterTileStatus { VETSB_ENTERED_WORMHOLE = 1 << VETS_ENTERED_WORMHOLE, ///< The vehicle either entered a bridge, tunnel or depot tile (this includes the last tile of the bridge/tunnel) VETSB_CANNOT_ENTER = 1 << VETS_CANNOT_ENTER, ///< The vehicle cannot enter the tile }; -DECLARE_ENUM_AS_BIT_SET(VehicleEnterTileStatus); +DECLARE_ENUM_AS_BIT_SET(VehicleEnterTileStatus) /** Tile information, used while rendering the tile */ struct TileInfo { diff --git a/src/tilehighlight_type.h b/src/tilehighlight_type.h index 15b26d9ed9..45069ffa28 100644 --- a/src/tilehighlight_type.h +++ b/src/tilehighlight_type.h @@ -39,7 +39,7 @@ enum HighLightStyle { HT_DIR_END, ///< end marker HT_DIR_MASK = 0x7 ///< masks the drag-direction }; -DECLARE_ENUM_AS_BIT_SET(HighLightStyle); +DECLARE_ENUM_AS_BIT_SET(HighLightStyle) struct TileHighlightData { diff --git a/src/town.h b/src/town.h index 25794f0842..d589d8f1ed 100644 --- a/src/town.h +++ b/src/town.h @@ -223,7 +223,7 @@ enum TownActions { TACT_FUNDS = TACT_BUY_RIGHTS | TACT_BRIBE, ///< All possible funding actions. TACT_ALL = TACT_ADVERTISE | TACT_CONSTRUCTION | TACT_FUNDS, ///< All possible actions. }; -DECLARE_ENUM_AS_BIT_SET(TownActions); +DECLARE_ENUM_AS_BIT_SET(TownActions) extern const byte _town_action_costs[TACT_COUNT]; extern TownID _new_town_id; diff --git a/src/track_type.h b/src/track_type.h index b2428f7f80..b5c95d575c 100644 --- a/src/track_type.h +++ b/src/track_type.h @@ -31,7 +31,7 @@ enum Track { }; /** Allow incrementing of Track variables */ -DECLARE_POSTFIX_INCREMENT(Track); +DECLARE_POSTFIX_INCREMENT(Track) /** Define basic enum properties */ template <> struct EnumPropsT : MakeEnumPropsT {}; typedef TinyEnumT TrackByte; @@ -59,7 +59,7 @@ enum TrackBits { TRACK_BIT_DEPOT = 0x80U, ///< Bitflag for a depot INVALID_TRACK_BIT = 0xFF ///< Flag for an invalid trackbits value }; -DECLARE_ENUM_AS_BIT_SET(TrackBits); +DECLARE_ENUM_AS_BIT_SET(TrackBits) typedef SimpleTinyEnumT TrackBitsByte; /** @@ -121,7 +121,7 @@ enum TrackdirBits { TRACKDIR_BIT_MASK = 0x3F3F, ///< Bitmask for bit-operations INVALID_TRACKDIR_BIT = 0xFFFF, ///< Flag for an invalid trackdirbit value }; -DECLARE_ENUM_AS_BIT_SET(TrackdirBits); +DECLARE_ENUM_AS_BIT_SET(TrackdirBits) typedef SimpleTinyEnumT TrackdirBitsShort; typedef uint32 TrackStatus; diff --git a/src/vehicle_type.h b/src/vehicle_type.h index e384761db8..900d54f99a 100644 --- a/src/vehicle_type.h +++ b/src/vehicle_type.h @@ -27,7 +27,7 @@ enum VehicleType { VEH_END, VEH_INVALID = 0xFF, ///< Non-existing type of vehicle. }; -DECLARE_POSTFIX_INCREMENT(VehicleType); +DECLARE_POSTFIX_INCREMENT(VehicleType) /** It needs to be 8bits, because we save and load it as such */ typedef SimpleTinyEnumT VehicleTypeByte; diff --git a/src/viewport_type.h b/src/viewport_type.h index 8581ddb00c..165d20c20b 100644 --- a/src/viewport_type.h +++ b/src/viewport_type.h @@ -82,7 +82,7 @@ enum ViewportPlaceMethod { VPM_RAILDIRS = 0x40, ///< all rail directions VPM_SIGNALDIRS = 0x80, ///< similiar to VMP_RAILDIRS, but with different cursor }; -DECLARE_ENUM_AS_BIT_SET(ViewportPlaceMethod); +DECLARE_ENUM_AS_BIT_SET(ViewportPlaceMethod) /** Drag and drop selection process, or, what to do with an area of land when * you've selected it. */ diff --git a/src/widget_type.h b/src/widget_type.h index 820e5c268d..d73f2d4289 100644 --- a/src/widget_type.h +++ b/src/widget_type.h @@ -235,7 +235,7 @@ enum NWidgetDisplay { ND_SHADE_DIMMED = 1 << NDB_SHADE_DIMMED, ///< Bit value of the 'dimmed colours' flag. ND_DROPDOWN_ACTIVE = 1 << NDB_DROPDOWN_ACTIVE, ///< Bit value of the 'dropdown active' flag. }; -DECLARE_ENUM_AS_BIT_SET(NWidgetDisplay); +DECLARE_ENUM_AS_BIT_SET(NWidgetDisplay) /** Base class for a 'real' widget. * @ingroup NestedWidgets */ @@ -358,7 +358,7 @@ enum NWidContainerFlags { NC_NONE = 0, ///< All flags cleared. NC_EQUALSIZE = 1 << NCB_EQUALSIZE, ///< Value of the #NCB_EQUALSIZE flag. }; -DECLARE_ENUM_AS_BIT_SET(NWidContainerFlags); +DECLARE_ENUM_AS_BIT_SET(NWidContainerFlags) /** Container with pre/inter/post child space. */ class NWidgetPIPContainer : public NWidgetContainer { diff --git a/src/window_gui.h b/src/window_gui.h index 2956b7eabb..1a3bb217bf 100644 --- a/src/window_gui.h +++ b/src/window_gui.h @@ -30,7 +30,7 @@ enum FrameFlags { FR_DARKENED = 1 << 6, ///< If set the background is darker, allows for lowered frames with normal background colour when used with FR_LOWERED (ie. dropdown boxes) }; -DECLARE_ENUM_AS_BIT_SET(FrameFlags); +DECLARE_ENUM_AS_BIT_SET(FrameFlags) /** Distances used in drawing widgets. */ enum WidgetDrawDistances {