TakeV/dxx-rebirth
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix LTO build of Descent 2

Browse source 
enum game_mode_flags must be visible in common code, which does not
define DXX_BUILD_DESCENT_II.  To avoid One Definition Rule errors,
game_mode_flags must have the same definition in all files.
Fortunately, the DXX_BUILD_DESCENT_II definition is a superset of the
common definition, so the preprocessor guards can be replaced with
advisory comments.

Fixes: 2b718da343 ("Use enum class for Game_mode, Newdemo_game_mode")
This commit is contained in:
Kp 2021-11-01 03:37:20 +00:00
parent 0044c010ad
commit 9fc7a14777
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
common/main/game.h
View file

@ -85,10 +85,10 @@ enum class game_mode_flag : uint16_t
unknown = 1u << 6,
team = 1u << 8,
bounty = 1u << 9,
#if defined(DXX_BUILD_DESCENT_II)
/* if DXX_BUILD_DESCENT_II */
capture = 1u << 10,
hoard = 1u << 11,
#endif
/* endif */
};
enum class game_mode_flags : uint16_t
@ -99,11 +99,11 @@ enum class game_mode_flags : uint16_t
anarchy_with_robots = static_cast<uint16_t>(game_mode_flag::network) | static_cast<uint16_t>(game_mode_flag::multi_robots),
cooperative = static_cast<uint16_t>(game_mode_flag::network) | static_cast<uint16_t>(game_mode_flag::multi_robots) | static_cast<uint16_t>(game_mode_flag::multi_coop),
bounty = static_cast<uint16_t>(game_mode_flag::network) | static_cast<uint16_t>(game_mode_flag::bounty),
#if defined(DXX_BUILD_DESCENT_II)
/* if DXX_BUILD_DESCENT_II */
capture_flag = static_cast<uint16_t>(game_mode_flag::network) | static_cast<uint16_t>(game_mode_flag::team) | static_cast<uint16_t>(game_mode_flag::capture),
hoard = static_cast<uint16_t>(game_mode_flag::network) | static_cast<uint16_t>(game_mode_flag::hoard),
team_hoard = static_cast<uint16_t>(game_mode_flag::network) | static_cast<uint16_t>(game_mode_flag::team) | static_cast<uint16_t>(game_mode_flag::hoard),
#endif
/* endif */
};
// The following bits define the game modes.