WIP

IonAgorria · Oct 23, 2023 · 4c7168a · 4c7168a
1 parent 255adfc
commit 4c7168a
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/Source/Scripts/SquadShellEnums.inl b/Source/Scripts/SquadShellEnums.inl
@@ -697,8 +697,6 @@ enum ShellControlID
 //	SQSH_MAX = 0xFFFFFFFF
 };
 
-DECLARE_ENUM_DESCRIPTOR(ShellControlID)
-
 enum SHELL_CONTROL_STATE
 {
 	SQSH_VISIBLE = 1<<0,

diff --git a/Source/Units/UnitAttribute.h b/Source/Units/UnitAttribute.h
@@ -56,6 +56,7 @@ DECLARE_ENUM_DESCRIPTOR(terEffectID)
 DECLARE_ENUM_DESCRIPTOR(PlacementStrategy)
 DECLARE_ENUM_DESCRIPTOR(ChooseSquadID)
 DECLARE_ENUM_DESCRIPTOR(GAME_CONTENT)
+DECLARE_ENUM_DESCRIPTOR(ShellControlID)
 DECLARE_ENUM_DESCRIPTOR_ENCLOSED(RigidBodyPrm, RigidBodyType)
 #endif
 

diff --git a/Source/Util/Serialization.h b/Source/Util/Serialization.h
@@ -640,8 +640,8 @@ SingletonPrm<Type>
 /////////////////////////////////////////////////
 //		Регистрация enums
 /////////////////////////////////////////////////
-template<class Enum>
-const EnumDescriptor<Enum>& getEnumDescriptor(const Enum& key);
+//template<class Enum>
+//const EnumDescriptor<Enum>& getEnumDescriptor(const Enum& key);
 
 #define BEGIN_ENUM_DESCRIPTOR(enumType, enumName)	\
 	struct Enum##enumType : EnumDescriptor<enumType> { Enum##enumType(); }; \