diff options
| author | Léo Lam <leo@leolam.fr> | 2021-05-02 00:20:13 +0200 |
|---|---|---|
| committer | Léo Lam <leo@leolam.fr> | 2021-05-02 00:22:59 +0200 |
| commit | 461967e278f5d3973fc50cfd1a3c96b07ef362fe (patch) | |
| tree | 19cc995bbdc29b791ace5fb41841c724c63cbbcc /src | |
| parent | 9f6cdf69b4afc8466f6a5642648e1b854c2830f9 (diff) | |
ksys/gdt: Move FlagHandle to separate header
To avoid header bloat.
Diffstat (limited to 'src')
| -rw-r--r-- | src/KingSystem/GameData/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | src/KingSystem/GameData/gdtFlagHandle.h | 11 | ||||
| -rw-r--r-- | src/KingSystem/GameData/gdtManager.h | 5 |
3 files changed, 13 insertions, 4 deletions
diff --git a/src/KingSystem/GameData/CMakeLists.txt b/src/KingSystem/GameData/CMakeLists.txt index 110642fa..47aa4b50 100644 --- a/src/KingSystem/GameData/CMakeLists.txt +++ b/src/KingSystem/GameData/CMakeLists.txt @@ -5,6 +5,7 @@ target_sources(uking PRIVATE gdtCommonFlagsUtils.h gdtFlag.cpp gdtFlag.h + gdtFlagHandle.h gdtFlagProxy.h gdtFlagUtils.h gdtManager.cpp diff --git a/src/KingSystem/GameData/gdtFlagHandle.h b/src/KingSystem/GameData/gdtFlagHandle.h new file mode 100644 index 00000000..cac206c3 --- /dev/null +++ b/src/KingSystem/GameData/gdtFlagHandle.h @@ -0,0 +1,11 @@ +#pragma once + +#include <basis/seadTypes.h> + +namespace ksys::gdt { + +enum class FlagHandle : u32 {}; + +constexpr FlagHandle InvalidHandle = FlagHandle(-1); + +} // namespace ksys::gdt diff --git a/src/KingSystem/GameData/gdtManager.h b/src/KingSystem/GameData/gdtManager.h index c480977e..2ddc0308 100644 --- a/src/KingSystem/GameData/gdtManager.h +++ b/src/KingSystem/GameData/gdtManager.h @@ -9,6 +9,7 @@ #include <prim/seadTypedBitFlag.h> #include <thread/seadMutex.h> #include <type_traits> +#include "KingSystem/GameData/gdtFlagHandle.h" #include "KingSystem/GameData/gdtTriggerParam.h" #include "KingSystem/Resource/resHandle.h" #include "KingSystem/System/KingEditor.h" @@ -56,10 +57,6 @@ struct SetterTraits { } // namespace detail -enum class FlagHandle : u32 {}; - -constexpr FlagHandle InvalidHandle = FlagHandle(-1); - class TriggerParamRef { public: TriggerParamRef(TriggerParam** param_1, TriggerParam** param, bool check_permissions, |
