Mercurial > hg > openttd
changeset 18747:9e25a152f92d draft
(svn r23595) -Codechange: add comma after last enum to get a more uniform coding style
line wrap: on
line diff
--- a/src/aircraft.h +++ b/src/aircraft.h @@ -22,7 +22,7 @@ AIR_HELICOPTER = 0, ///< an helicopter AIR_AIRCRAFT = 2, ///< an airplane AIR_SHADOW = 4, ///< shadow of the aircraft - AIR_ROTOR = 6 ///< rotor of an helicopter + AIR_ROTOR = 6, ///< rotor of an helicopter }; /** Aircraft flags. */
--- a/src/aircraft_cmd.cpp +++ b/src/aircraft_cmd.cpp @@ -574,7 +574,7 @@ SPEED_LIMIT_APPROACH = 230, ///< Maximum speed of an aircraft on finals SPEED_LIMIT_BROKEN = 320, ///< Maximum speed of an aircraft that is broken SPEED_LIMIT_HOLD = 425, ///< Maximum speed of an aircraft that flies the holding pattern - SPEED_LIMIT_NONE = 0xFFFF ///< No environmental speed limit. Speed limit is type dependent + SPEED_LIMIT_NONE = 0xFFFF, ///< No environmental speed limit. Speed limit is type dependent }; /**
--- a/src/airport.h +++ b/src/airport.h @@ -52,7 +52,7 @@ AMED_BRAKE = 1 << 5, ///< Taxiing at the airport. AMED_HELI_RAISE = 1 << 6, ///< Helicopter take-off. AMED_HELI_LOWER = 1 << 7, ///< Helicopter landing. - AMED_HOLD = 1 << 8 ///< Holding pattern movement (above the airport). + AMED_HOLD = 1 << 8, ///< Holding pattern movement (above the airport). }; /** Movement States on Airports (headings target) */ @@ -144,7 +144,7 @@ AIRPLANES = 0x1, ///< Can planes land on this airport type? HELICOPTERS = 0x2, ///< Can helicopters land on this airport type? ALL = AIRPLANES | HELICOPTERS, ///< Mask to check for both planes and helicopters. - SHORT_STRIP = 0x4 ///< This airport has a short landing strip, dangerous for fast aircraft. + SHORT_STRIP = 0x4, ///< This airport has a short landing strip, dangerous for fast aircraft. }; AirportFTAClass(
--- a/src/base_media_base.h +++ b/src/base_media_base.h @@ -194,7 +194,7 @@ GFT_TROPICAL, ///< Landscape replacement sprites for tropical GFT_TOYLAND, ///< Landscape replacement sprites for toyland GFT_EXTRA, ///< Extra sprites that were not part of the original sprites - MAX_GFT ///< We are looking for this amount of GRFs + MAX_GFT, ///< We are looking for this amount of GRFs }; /** Blitter type for base graphics sets. */
--- a/src/cargotype.h +++ b/src/cargotype.h @@ -47,7 +47,7 @@ CC_REFRIGERATED = 1 << 7, ///< Refrigerated cargo (Food, Fruit) CC_HAZARDOUS = 1 << 8, ///< Hazardous cargo (Nuclear Fuel, Explosives, etc.) CC_COVERED = 1 << 9, ///< Covered/Sheltered Freight (Transporation in Box Vans, Silo Wagons, etc.) - CC_SPECIAL = 1 << 15 ///< Special bit used for livery refit tricks instead of normal cargoes. + CC_SPECIAL = 1 << 15, ///< Special bit used for livery refit tricks instead of normal cargoes. }; static const byte INVALID_CARGO = 0xFF; ///< Constant representing invalid cargo
--- a/src/clear_map.h +++ b/src/clear_map.h @@ -24,7 +24,7 @@ CLEAR_ROCKS = 2, ///< 3 CLEAR_FIELDS = 3, ///< 3 CLEAR_SNOW = 4, ///< 0-3 - CLEAR_DESERT = 5 ///< 1,3 + CLEAR_DESERT = 5, ///< 1,3 };
--- a/src/command_type.h +++ b/src/command_type.h @@ -293,7 +293,7 @@ CMD_AUTOFILL_TIMETABLE, ///< autofill the timetable CMD_SET_TIMETABLE_START, ///< set the date that a timetable should start - CMD_END ///< Must ALWAYS be on the end of this list!! (period) + CMD_END, ///< Must ALWAYS be on the end of this list!! (period) }; /**
--- a/src/company_manager_face.h +++ b/src/company_manager_face.h @@ -28,7 +28,7 @@ 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 { @@ -50,9 +50,9 @@ CMFV_COLLAR, CMFV_TIE_EARRING, CMFV_GLASSES, - CMFV_END + 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 {
--- a/src/company_type.h +++ b/src/company_type.h @@ -60,7 +60,7 @@ CRR_AUTOCLEAN, ///< The company is removed due to autoclean. CRR_BANKRUPT, ///< The company went belly-up. - CRR_END ///< Sentinel for end. + CRR_END, ///< Sentinel for end. }; #endif /* COMPANY_TYPE_H */
--- a/src/console_type.h +++ b/src/console_type.h @@ -18,7 +18,7 @@ enum IConsoleModes { ICONSOLE_FULL, ///< In-game console is closed. ICONSOLE_OPENED, ///< In-game console is opened, upper 1/3 of the screen. - ICONSOLE_CLOSED ///< In-game console is opened, whole screen. + ICONSOLE_CLOSED, ///< In-game console is opened, whole screen. }; /* Colours of the console messages. */
--- a/src/direction_type.h +++ b/src/direction_type.h @@ -68,7 +68,7 @@ DIRDIFF_90RIGHT = 2, ///< Angle of 90 degrees right DIRDIFF_REVERSE = 4, ///< One direction is the opposit of the other one DIRDIFF_90LEFT = 6, ///< Angle of 90 degrees left - DIRDIFF_45LEFT = 7 ///< Angle of 45 degrees left + DIRDIFF_45LEFT = 7, ///< Angle of 45 degrees left }; @@ -109,7 +109,7 @@ DIAGDIRDIFF_SAME = 0, ///< Same directions DIAGDIRDIFF_90RIGHT = 1, ///< 90 degrees right DIAGDIRDIFF_REVERSE = 2, ///< Reverse directions - DIAGDIRDIFF_90LEFT = 3 ///< 90 degrees left + DIAGDIRDIFF_90LEFT = 3, ///< 90 degrees left }; /** Allow incrementing of DiagDirDiff variables */
--- a/src/economy_type.h +++ b/src/economy_type.h @@ -49,7 +49,7 @@ SCORE_TOTAL = 9, ///< This must always be the last entry SCORE_END = 10, ///< How many scores are there.. - SCORE_MAX = 1000 ///< The max score that can be in the performance history + 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)
--- a/src/endian_check.cpp +++ b/src/endian_check.cpp @@ -24,7 +24,7 @@ /** Supported endian types */ enum Endian { ENDIAN_LITTLE, ///< little endian - ENDIAN_BIG ///< big endian + ENDIAN_BIG, ///< big endian }; /**
--- a/src/fileio_func.h +++ b/src/fileio_func.h @@ -100,7 +100,7 @@ NEWGRF = 1 << 1, ///< Scan for non-base sets. AI = 1 << 2, ///< Scan for AIs and its libraries. SCENARIO = 1 << 3, ///< Scan for scenarios and heightmaps. - ALL = BASESET | NEWGRF | AI | SCENARIO ///< Scan for everything. + ALL = BASESET | NEWGRF | AI | SCENARIO, ///< Scan for everything. }; /* virtual */ bool AddFile(const char *filename, size_t basepath_length, const char *tar_filename = NULL);
--- a/src/ground_vehicle.hpp +++ b/src/ground_vehicle.hpp @@ -20,7 +20,7 @@ /** What is the status of our acceleration? */ enum AccelStatus { AS_ACCEL, ///< We want to go faster, if possible of course. - AS_BRAKE ///< We want to stop. + AS_BRAKE, ///< We want to stop. }; /** @@ -50,8 +50,8 @@ /** Ground vehicle flags. */ enum GroundVehicleFlags { - GVF_GOINGUP_BIT = 0, ///< Vehicle is currently going uphill. (Cached track information for acceleration) - GVF_GOINGDOWN_BIT = 1, ///< Vehicle is currently going downhill. (Cached track information for acceleration) + GVF_GOINGUP_BIT = 0, ///< Vehicle is currently going uphill. (Cached track information for acceleration) + GVF_GOINGDOWN_BIT = 1, ///< Vehicle is currently going downhill. (Cached track information for acceleration) GVF_SUPPRESS_IMPLICIT_ORDERS = 2, ///< Disable insertion and removal of automatic orders until the vehicle completes the real order. };
--- a/src/industrytype.h +++ b/src/industrytype.h @@ -57,7 +57,7 @@ ICT_UNKNOWN, ///< in previous game version or without newindustries activated ICT_NORMAL_GAMEPLAY, ///< either by user or random creation process ICT_MAP_GENERATION, ///< during random map creation - ICT_SCENARIO_EDITOR ///< while editing a scenario + ICT_SCENARIO_EDITOR, ///< while editing a scenario }; /** Various industry behaviours mostly to represent original TTD specialities */
--- a/src/network/core/tcp_admin.h +++ b/src/network/core/tcp_admin.h @@ -66,7 +66,7 @@ enum AdminStatus { ADMIN_STATUS_INACTIVE, ///< The admin is not connected nor active. ADMIN_STATUS_ACTIVE, ///< The admin is active. - ADMIN_STATUS_END ///< Must ALWAYS be on the end of this list!! (period) + ADMIN_STATUS_END, ///< Must ALWAYS be on the end of this list!! (period) }; /** Update types an admin can register a frequency for */ @@ -80,7 +80,7 @@ ADMIN_UPDATE_CONSOLE, ///< The admin would like to have console messages. ADMIN_UPDATE_CMD_NAMES, ///< The admin would like a list of all DoCommand names. ADMIN_UPDATE_CMD_LOGGING, ///< The admin would like to have DoCommand information. - ADMIN_UPDATE_END ///< Must ALWAYS be on the end of this list!! (period) + ADMIN_UPDATE_END, ///< Must ALWAYS be on the end of this list!! (period) }; /** Update frequencies an admin can register. */ @@ -101,7 +101,7 @@ ADMIN_CRR_AUTOCLEAN, ///< The company is removed due to autoclean. ADMIN_CRR_BANKRUPT, ///< The company went belly-up. - ADMIN_CRR_END ///< Sentinel for end. + ADMIN_CRR_END, ///< Sentinel for end. }; /** Main socket handler for admin related connections. */
--- a/src/network/core/tcp_content.h +++ b/src/network/core/tcp_content.h @@ -44,12 +44,12 @@ PACKET_CONTENT_SERVER_INFO, ///< Reply of content server with information about content PACKET_CONTENT_CLIENT_CONTENT, ///< Request a content file given an internal ID PACKET_CONTENT_SERVER_CONTENT, ///< Reply with the content of the given ID - PACKET_CONTENT_END ///< Must ALWAYS be on the end of this list!! (period) + PACKET_CONTENT_END, ///< Must ALWAYS be on the end of this list!! (period) }; /** Unique identifier for the content. */ enum ContentID { - INVALID_CONTENT_ID = UINT32_MAX ///< Sentinel for invalid content. + INVALID_CONTENT_ID = UINT32_MAX, ///< Sentinel for invalid content. }; /** Container for all important information about a piece of content. */ @@ -61,7 +61,7 @@ AUTOSELECTED, ///< The content has been selected as dependency ALREADY_HERE, ///< The content is already at the client side DOES_NOT_EXIST, ///< The content does not exist in the content system - INVALID ///< The content's invalid + INVALID, ///< The content's invalid }; ContentType type; ///< Type of content
--- a/src/network/core/tcp_game.h +++ b/src/network/core/tcp_game.h @@ -123,7 +123,7 @@ PACKET_CLIENT_ERROR, ///< A client reports an error to the server. PACKET_SERVER_ERROR_QUIT, ///< A server tells that a client has hit an error and did quit. - PACKET_END ///< Must ALWAYS be on the end of this list!! (period) + PACKET_END, ///< Must ALWAYS be on the end of this list!! (period) }; /** Packet that wraps a command */
--- a/src/network/core/udp.h +++ b/src/network/core/udp.h @@ -34,7 +34,7 @@ PACKET_UDP_CLIENT_GET_NEWGRFS, ///< Requests the name for a list of GRFs (GRF_ID and MD5) PACKET_UDP_SERVER_NEWGRFS, ///< Sends the list of NewGRF's requested. PACKET_UDP_MASTER_SESSION_KEY, ///< Sends a fresh session key to the client - PACKET_UDP_END ///< Must ALWAYS be on the end of this list!! (period) + PACKET_UDP_END, ///< Must ALWAYS be on the end of this list!! (period) }; /** The types of server lists we can get */ @@ -43,7 +43,7 @@ SLT_IPv6 = 1, ///< Get the IPv6 addresses SLT_AUTODETECT, ///< Autodetect the type based on the connection - SLT_END = SLT_AUTODETECT ///< End of 'arrays' marker + SLT_END = SLT_AUTODETECT, ///< End of 'arrays' marker }; /** Base socket handler for all UDP sockets */
--- a/src/network/network_client.h +++ b/src/network/network_client.h @@ -34,7 +34,7 @@ STATUS_MAP_WAIT, ///< The client is waiting as someone else is downloading the map. STATUS_MAP, ///< The client is downloading the map. STATUS_ACTIVE, ///< The client is active within in the game. - STATUS_END ///< Must ALWAYS be on the end of this list!! (period) + STATUS_END, ///< Must ALWAYS be on the end of this list!! (period) }; ServerStatus status; ///< Status of the connection with the server.
--- a/src/network/network_server.h +++ b/src/network/network_server.h @@ -65,7 +65,7 @@ STATUS_DONE_MAP, ///< The client has downloaded the map. STATUS_PRE_ACTIVE, ///< The client is catching up the delayed frames. STATUS_ACTIVE, ///< The client is active within in the game. - STATUS_END ///< Must ALWAYS be on the end of this list!! (period). + STATUS_END, ///< Must ALWAYS be on the end of this list!! (period). }; byte lag_test; ///< Byte used for lag-testing the client
--- a/src/newgrf.h +++ b/src/newgrf.h @@ -84,7 +84,7 @@ GSF_FAKE_TOWNS = GSF_END, ///< Fake town GrfSpecFeature for NewGRF debugging (parent scope) GSF_FAKE_END, ///< End of the fake features - GSF_INVALID = 0xFF ///< An invalid spec feature + GSF_INVALID = 0xFF, ///< An invalid spec feature }; static const uint32 INVALID_GRFID = 0xFFFFFFFF;
--- a/src/newgrf_config.h +++ b/src/newgrf_config.h @@ -36,7 +36,7 @@ GCS_DISABLED, ///< GRF file is disabled GCS_NOT_FOUND, ///< GRF file was not found in the local cache GCS_INITIALISED, ///< GRF file has been initialised - GCS_ACTIVATED ///< GRF file has been activated + GCS_ACTIVATED, ///< GRF file has been activated }; /** Encountered GRF bugs */ @@ -51,7 +51,7 @@ enum GRFListCompatibility { GLC_ALL_GOOD, ///< All GRF needed by game are present GLC_COMPATIBLE, ///< Compatible (eg. the same ID, but different chacksum) GRF found in at least one case - GLC_NOT_FOUND ///< At least one GRF couldn't be found (higher priority than GLC_COMPATIBLE) + GLC_NOT_FOUND, ///< At least one GRF couldn't be found (higher priority than GLC_COMPATIBLE) }; /** Information that can/has to be stored about a GRF's palette. */ @@ -154,7 +154,7 @@ TFT_CHANGELOG, ///< NewGRF changelog TFT_LICENSE, ///< NewGRF license - TFT_END + TFT_END, }; DECLARE_POSTFIX_INCREMENT(TextfileType)
--- a/src/newgrf_house.h +++ b/src/newgrf_house.h @@ -30,8 +30,8 @@ * need to be persistent; it just needs to keep class ids unique. */ struct HouseClassMapping { - uint32 grfid; ////< The GRF ID of the file this class belongs to - uint8 class_id; ////< The class id within the grf file + uint32 grfid; ///< The GRF ID of the file this class belongs to + uint8 class_id; ///< The class id within the grf file }; HouseClassID AllocateHouseClassID(byte grf_class_id, uint32 grfid);
--- a/src/news_type.h +++ b/src/news_type.h @@ -80,7 +80,7 @@ NR_STATION, ///< Reference station. Scroll to station when clicking on the news. Delete news when station is deleted. NR_INDUSTRY, ///< Reference industry. Scroll to industry when clicking on the news. Delete news when industry is deleted. NR_TOWN, ///< Reference town. Scroll to town when clicking on the news. - NR_ENGINE ///< Reference engine. + NR_ENGINE, ///< Reference engine. }; /**
--- a/src/rail_type.h +++ b/src/rail_type.h @@ -55,7 +55,7 @@ RAILTYPES_ELECTRIC = 1 << RAILTYPE_ELECTRIC, ///< Electrified rails RAILTYPES_MONO = 1 << RAILTYPE_MONO, ///< Monorail! RAILTYPES_MAGLEV = 1 << RAILTYPE_MAGLEV, ///< Ever fast maglev - INVALID_RAILTYPES = UINT_MAX ///< Invalid railtypes + INVALID_RAILTYPES = UINT_MAX, ///< Invalid railtypes }; DECLARE_ENUM_AS_BIT_SET(RailTypes)
--- a/src/road_map.h +++ b/src/road_map.h @@ -23,7 +23,7 @@ enum RoadTileType { ROAD_TILE_NORMAL, ///< Normal road ROAD_TILE_CROSSING, ///< Level crossing - ROAD_TILE_DEPOT ///< Depot (one entrance) + ROAD_TILE_DEPOT, ///< Depot (one entrance) }; /** @@ -257,7 +257,7 @@ DRD_SOUTHBOUND, ///< All southbound traffic is disallowed DRD_NORTHBOUND, ///< All northbound traffic is disallowed DRD_BOTH, ///< All directions are disallowed - DRD_END + DRD_END, ///< Sentinel }; DECLARE_ENUM_AS_BIT_SET(DisallowedRoadDirections) /** Helper information for extract tool. */ @@ -451,7 +451,7 @@ ROADSIDE_STREET_LIGHTS = 3, ///< Road with street lights on paved sidewalks ROADSIDE_TREES = 5, ///< Road with trees on paved sidewalks ROADSIDE_GRASS_ROAD_WORKS = 6, ///< Road on grass with road works - ROADSIDE_PAVED_ROAD_WORKS = 7 ///< Road with sidewalks and road works + ROADSIDE_PAVED_ROAD_WORKS = 7, ///< Road with sidewalks and road works }; /**
--- a/src/road_type.h +++ b/src/road_type.h @@ -20,11 +20,11 @@ * @note currently only ROADTYPE_ROAD and ROADTYPE_TRAM are supported. */ enum RoadType { - ROADTYPE_BEGIN = 0, ///< Used for iterations - ROADTYPE_ROAD = 0, ///< Basic road type - ROADTYPE_TRAM = 1, ///< Trams - ROADTYPE_END, ///< Used for iterations - INVALID_ROADTYPE = 0xFF ///< flag for invalid roadtype + ROADTYPE_BEGIN = 0, ///< Used for iterations + ROADTYPE_ROAD = 0, ///< Basic road type + ROADTYPE_TRAM = 1, ///< Trams + ROADTYPE_END, ///< Used for iterations + INVALID_ROADTYPE = 0xFF, ///< flag for invalid roadtype }; DECLARE_POSTFIX_INCREMENT(RoadType) template <> struct EnumPropsT<RoadType> : MakeEnumPropsT<RoadType, byte, ROADTYPE_BEGIN, ROADTYPE_END, INVALID_ROADTYPE, 2> {}; @@ -39,7 +39,7 @@ ROADTYPES_TRAM = 1 << ROADTYPE_TRAM, ///< Trams ROADTYPES_ALL = ROADTYPES_ROAD | ROADTYPES_TRAM, ///< Road + trams ROADTYPES_END, ///< Used for iterations? - INVALID_ROADTYPES = 0xFF ///< Invalid roadtypes + INVALID_ROADTYPES = 0xFF, ///< Invalid roadtypes }; DECLARE_ENUM_AS_BIT_SET(RoadTypes) template <> struct EnumPropsT<RoadTypes> : MakeEnumPropsT<RoadTypes, byte, ROADTYPES_NONE, ROADTYPES_END, INVALID_ROADTYPES, 2> {}; @@ -68,7 +68,7 @@ ROAD_ALL = ROAD_X | ROAD_Y, ///< Full 4-way crossing - ROAD_END = ROAD_ALL + 1 ///< Out-of-range roadbits, used for iterations + ROAD_END = ROAD_ALL + 1, ///< Out-of-range roadbits, used for iterations }; DECLARE_ENUM_AS_BIT_SET(RoadBits) template <> struct EnumPropsT<RoadBits> : MakeEnumPropsT<RoadBits, byte, ROAD_NONE, ROAD_END, ROAD_NONE, 4> {};
--- a/src/roadveh.h +++ b/src/roadveh.h @@ -55,7 +55,7 @@ RVSB_DRIVE_SIDE = 1 << RVS_DRIVE_SIDE, ///< The vehicle is at the opposite side of the road RVSB_TRACKDIR_MASK = 0x0F, ///< The mask used to extract track dirs - RVSB_ROAD_STOP_TRACKDIR_MASK = 0x09 ///< Only bits 0 and 3 are used to encode the trackdir for road stops + RVSB_ROAD_STOP_TRACKDIR_MASK = 0x09, ///< Only bits 0 and 3 are used to encode the trackdir for road stops }; /** State information about the Road Vehicle controller */
--- a/src/saveload/oldloader.h +++ b/src/saveload/oldloader.h @@ -78,7 +78,7 @@ */ OC_DEREFERENCE_POINTER = 1 << 31, - OC_END = 0 ///< End of the whole chunk, all 32 bits set to zero + OC_END = 0, ///< End of the whole chunk, all 32 bits set to zero }; DECLARE_ENUM_AS_BIT_SET(OldChunkType)
--- a/src/saveload/saveload.h +++ b/src/saveload/saveload.h @@ -40,7 +40,7 @@ SGT_TTDP2, ///< TTDP savegame in new format (data at SE border) SGT_OTTD, ///< OTTD savegame SGT_TTO, ///< TTO savegame - SGT_INVALID = 0xFF ///< broken savegame (used internally) + SGT_INVALID = 0xFF, ///< broken savegame (used internally) }; void GenerateDefaultSaveName(char *buf, const char *last);
--- a/src/signal_type.h +++ b/src/signal_type.h @@ -17,7 +17,7 @@ /** Variant of the signal, i.e. how does the signal look? */ enum SignalVariant { SIG_ELECTRIC = 0, ///< Light signal - SIG_SEMAPHORE = 1 ///< Old-fashioned semaphore signal + SIG_SEMAPHORE = 1, ///< Old-fashioned semaphore signal }; @@ -32,7 +32,7 @@ SIGTYPE_END, SIGTYPE_LAST = SIGTYPE_PBS_ONEWAY, - SIGTYPE_LAST_NOPBS = SIGTYPE_COMBO + SIGTYPE_LAST_NOPBS = SIGTYPE_COMBO, }; /** Helper information for extract tool. */ template <> struct EnumPropsT<SignalType> : MakeEnumPropsT<SignalType, byte, SIGTYPE_NORMAL, SIGTYPE_END, SIGTYPE_END, 3> {};
--- a/src/slope_type.h +++ b/src/slope_type.h @@ -112,7 +112,7 @@ FOUNDATION_RAIL_E, ///< Foundation for TRACK_BIT_RIGHT, but not a leveled foundation. FOUNDATION_RAIL_N, ///< Foundation for TRACK_BIT_UPPER, but not a leveled foundation. - FOUNDATION_INVALID = 0xFF ///< Used inside "rail_cmd.cpp" to indicate invalid slope/track combination. + FOUNDATION_INVALID = 0xFF, ///< Used inside "rail_cmd.cpp" to indicate invalid slope/track combination. }; #endif /* SLOPE_TYPE_H */
--- a/src/station_type.h +++ b/src/station_type.h @@ -42,7 +42,7 @@ /** Types of RoadStops */ enum RoadStopType { ROADSTOP_BUS, ///< A standard stop for buses - ROADSTOP_TRUCK ///< A standard stop for trucks + ROADSTOP_TRUCK, ///< A standard stop for trucks }; /** The facilities a station might be having */
--- a/src/tgp.cpp +++ b/src/tgp.cpp @@ -228,7 +228,7 @@ 6, ///< Very flat 9, ///< Flat 12, ///< Hilly - 15 ///< Mountainous + 15, ///< Mountainous }; /**
--- a/src/tilehighlight_type.h +++ b/src/tilehighlight_type.h @@ -32,14 +32,14 @@ /* lower bits (used with HT_LINE and HT_RAIL): * (see ASCII art in table/autorail.h for a visual interpretation) */ - HT_DIR_X = 0, ///< X direction - HT_DIR_Y = 1, ///< Y direction - HT_DIR_HU = 2, ///< horizontal upper - HT_DIR_HL = 3, ///< horizontal lower - HT_DIR_VL = 4, ///< vertical left - HT_DIR_VR = 5, ///< vertical right - HT_DIR_END, ///< end marker - HT_DIR_MASK = 0x7 ///< masks the drag-direction + HT_DIR_X = 0, ///< X direction + HT_DIR_Y = 1, ///< Y direction + HT_DIR_HU = 2, ///< horizontal upper + HT_DIR_HL = 3, ///< horizontal lower + HT_DIR_VL = 4, ///< vertical left + HT_DIR_VR = 5, ///< vertical right + HT_DIR_END, ///< end marker + HT_DIR_MASK = 0x7, ///< masks the drag-direction }; DECLARE_ENUM_AS_BIT_SET(HighLightStyle)
--- a/src/town.h +++ b/src/town.h @@ -165,7 +165,7 @@ enum TownFlags { TOWN_IS_FUNDED = 0, ///< Town has received some funds for TOWN_HAS_CHURCH = 1, ///< There can be only one church by town. - TOWN_HAS_STADIUM = 2 ///< There can be only one stadium by town. + TOWN_HAS_STADIUM = 2, ///< There can be only one stadium by town. }; CommandCost CheckforTownRating(DoCommandFlag flags, Town *t, TownRatingCheckType type);
--- a/src/track_type.h +++ b/src/track_type.h @@ -27,7 +27,7 @@ TRACK_LEFT = 4, ///< Track in the left corner of the tile (west) TRACK_RIGHT = 5, ///< Track in the right corner of the tile (east) TRACK_END, ///< Used for iterations - INVALID_TRACK = 0xFF ///< Flag for an invalid track + INVALID_TRACK = 0xFF, ///< Flag for an invalid track }; /** Allow incrementing of Track variables */ @@ -57,7 +57,7 @@ TRACK_BIT_MASK = 0x3FU, ///< Bitmask for the first 6 bits TRACK_BIT_WORMHOLE = 0x40U, ///< Bitflag for a wormhole (used for tunnels) TRACK_BIT_DEPOT = 0x80U, ///< Bitflag for a depot - INVALID_TRACK_BIT = 0xFF ///< Flag for an invalid trackbits value + INVALID_TRACK_BIT = 0xFF, ///< Flag for an invalid trackbits value }; DECLARE_ENUM_AS_BIT_SET(TrackBits) typedef SimpleTinyEnumT<TrackBits, byte> TrackBitsByte;
--- a/src/widgets/genworld_widget.h +++ b/src/widgets/genworld_widget.h @@ -73,7 +73,7 @@ WID_CS_START_DATE_UP, ///< Increase start year (start later). WID_CS_FLAT_LAND_HEIGHT_DOWN, ///< Decrease flat land height. WID_CS_FLAT_LAND_HEIGHT_TEXT, ///< Clickable flat land height value. - WID_CS_FLAT_LAND_HEIGHT_UP ///< Increase flat land height. + WID_CS_FLAT_LAND_HEIGHT_UP, ///< Increase flat land height. }; /** Widgets of the WC_MODAL_PROGRESS (WC_MODAL_PROGRESS is also used in ScanProgressWidgets). */
--- a/src/widgets/misc_widget.h +++ b/src/widgets/misc_widget.h @@ -34,7 +34,7 @@ WID_QS_TEXT, ///< Text of the query. WID_QS_DEFAULT, ///< Default button. WID_QS_CANCEL, ///< Cancel button. - WID_QS_OK ///< OK button. + WID_QS_OK, ///< OK button. }; /** Widgets of the WC_CONFIRM_POPUP_QUERY (WC_CONFIRM_POPUP_QUERY is also used in BootstrapAskForDownloadWidgets). */ @@ -42,7 +42,7 @@ WID_Q_CAPTION, ///< Caption of the window. WID_Q_TEXT, ///< Text of the query. WID_Q_NO, ///< Yes button. - WID_Q_YES ///< No button. + WID_Q_YES, ///< No button. }; #endif /* WIDGETS_MISC_WIDGET_H */
--- a/src/widgets/toolbar_widget.h +++ b/src/widgets/toolbar_widget.h @@ -43,7 +43,7 @@ WID_TN_MESSAGES, ///< Messages menu. WID_TN_HELP, ///< Help menu. WID_TN_SWITCH_BAR, ///< Only available when toolbar has been split to switch between different subsets. - WID_TN_END ///< Helper for knowing the amount of widgets. + WID_TN_END, ///< Helper for knowing the amount of widgets. }; /** Widgets of the WC_MAIN_TOOLBAR, when in scenario editor. */