Merge pull request #25 from sourcehold/template-change-struct-instance-approach

[TEMPLATES] Change StructResolver instance approach

Author: TheRedDaemon

src/core/StructTest.h

@@ -3,3 +3,6 @@
 #include "ViewportRenderState.h"
 
 MACRO_STRUCT_RESOLVER(ViewportRenderState, false, 0x100) ViewportRenderState_Struct;
+
+// in this case, it will just instantiate the struct, calling the constructor, but only if implemented
+MACRO_STRUCT_INSTANCE(0x100);

src/core/ViewportRenderState.cpp

@@ -3,18 +3,6 @@
 
 #include "windowslib.h"
 
-// could also be placed in own file against the clutter
-// PROBLEM: Needs definition of address twice, could however be helped if addresses are moved into own struct/file
-MACRO_STRUCT_INSTANCE(ViewportRenderState, 0x100)
-{
-    // needs direct create return to properly work
-    // interestingly, "ViewportRenderState" here would be so big,
-    // a stack overflow would occur if it was not optimized to be no copy
-    // works with variables
-    // might work good together with the copy prevention
-    return ViewportRenderState();
-}
-
 ViewportRenderState::ViewportRenderState() { MACRO_CALL_MEMBER(ViewportRenderState_Func::_constructor_, this)(); }
 
 // FUNCTION: STRONGHOLDCRUSADER 0x004e1fa0

src/precomp/StructResolver.h

@@ -5,14 +5,10 @@
 
 struct StructResolver {
 private:
-    template <typename T, int gameAddress> static T instance();
+    template <typename T, int gameAddress> struct Instance;
 
     template <typename T, bool implemented, int gameAddress> struct InternalResolver;
     template <typename T, int gameAddress> struct InternalResolver<T, true, gameAddress> {
-    private:
-        static T instance;
-
-    public:
         static T* const ptr;
     };
     template <typename T, int gameAddress> struct InternalResolver<T, false, gameAddress> {
@@ -44,9 +40,10 @@ struct StructResolver {
 
 template <typename T, int gameAddress>
 T* const StructResolver::InternalResolver<T, false, gameAddress>::ptr = reinterpret_cast<T*>(gameAddress);
+
 template <typename T, int gameAddress>
-T StructResolver::InternalResolver<T, true, gameAddress>::instance = StructResolver::instance<T, gameAddress>();
-template <typename T, int gameAddress> T* const StructResolver::InternalResolver<T, true, gameAddress>::ptr = &instance;
+T* const StructResolver::InternalResolver<T, true, gameAddress>::ptr
+    = &StructResolver::Instance<T, gameAddress>::instance;
 
 template <int address> bool StructResolver::AddressUsageKeeper<address>::initialized = false;
 
@@ -64,7 +61,10 @@ StructResolver::Resolver<T, implemented, gameAddress>::Initializer::Initializer(
     template struct StructResolver::Resolver<STRUCT_TYPE, IMPLEMENTED, GAME_ADDRESS>;                                  \
     typedef StructResolver::Resolver<STRUCT_TYPE, IMPLEMENTED, GAME_ADDRESS>::Ptr
 
-#define MACRO_STRUCT_INSTANCE(STRUCT_TYPE, GAME_ADDRESS)                                                               \
-    template <> STRUCT_TYPE StructResolver::instance<STRUCT_TYPE, GAME_ADDRESS>()
+#define MACRO_STRUCT_INSTANCE(GAME_ADDRESS)                                                                            \
+    template <typename T> struct StructResolver::Instance<T, GAME_ADDRESS> {                                           \
+        static T instance;                                                                                             \
+    };                                                                                                                 \
+    template <typename T> T StructResolver::Instance<T, GAME_ADDRESS>::instance
 
 #endif // STRUCT_RESOLVER