diff options
| author | Bardur Arantsson <bardur@scientician.net> | 2019-02-15 19:20:25 +0100 |
|---|---|---|
| committer | Bardur Arantsson <bardur@scientician.net> | 2019-02-15 19:20:25 +0100 |
| commit | 23d4052eb88176ceb3cb3d769b09aa46a56e79cc (patch) | |
| tree | 0ed44b420f012954e4cbb6d5ae401b4f972e2497 /src/flag_set.hpp | |
| parent | 2e84ed7ccc2c5d217729e4996bb0e833c0f89638 (diff) | |
Move 'dungeon_flags' global to Game struct
We can get rid of a couple of icky macros, and at least it's a little
bit less global now.
Diffstat (limited to 'src/flag_set.hpp')
| -rw-r--r-- | src/flag_set.hpp | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/src/flag_set.hpp b/src/flag_set.hpp index 7960de42..570166b6 100644 --- a/src/flag_set.hpp +++ b/src/flag_set.hpp @@ -23,9 +23,6 @@ public: constexpr flag_set() : m_data { 0 } { - // It is *extremely* important that there are absolutely - // NO dependencies on any global objects in here; lest we - // fall into SIOF territory; see DECLARE_FLAG_ZERO_IMPL } // This method is a workaround for a a segmentation fault @@ -187,15 +184,3 @@ public: */ #define DECLARE_FLAG(type, name, tier, index) \ PP_GLOBAL_CONSTEXPR_CONST(type, name, DECLARE_FLAG_MAKE_INIT(type, tier, index)) - -/** - * Macro for declaring a zero'ed "flag" variable. - */ -#define DECLARE_FLAG_ZERO_INTF(type, name) \ - extern type name - -/** - * Macro for declaring the implementation of a zero'ed "flag" variable. - */ -#define DECLARE_FLAG_ZERO_IMPL(type, name) \ - type name { }; |