Merge pull request #746 from psiberx/master

More hotfixes for 1.21.0

src/overlay/widgets/TweakDBEditor.cpp

@@ -283,7 +283,7 @@ void TweakDBEditor::RefreshFlats()
                 }
 
                 const auto cGroupName = flatName.substr(0, idx);
-                cacheFlat(RED4ext::FNV1a64(cGroupName.c_str()), cGroupName.c_str(), flatName.substr(idx, idx + 1), dbid);
+                cacheFlat(RED4ext::FNV1a64(cGroupName.c_str()), cGroupName.c_str(), flatName.c_str(), dbid);
             }
         }
     });

src/reverse/RTTIHelper.cpp

@@ -18,7 +18,18 @@ static std::unique_ptr<RTTIHelper> s_pInstance{ nullptr };
 
 void RTTIHelper::Initialize(const LockableState& acLua, LuaSandbox& apSandbox)
 {
-    s_pInstance.reset(new RTTIHelper(acLua, apSandbox));
+    if (!s_pInstance)
+    {
+        s_pInstance.reset(new RTTIHelper(acLua, apSandbox));
+    }
+}
+
+void RTTIHelper::PostInitialize()
+{
+    if (s_pInstance)
+    {
+        s_pInstance->InitializeRuntime();
+    }
 }
 
 void RTTIHelper::Shutdown()
@@ -47,6 +58,10 @@ void RTTIHelper::InitializeRTTI()
     m_pRtti = RED4ext::CRTTISystem::Get();
     m_pGameInstanceType = m_pRtti->GetClass(RED4ext::FNV1a64("ScriptGameInstance"));
 
+}
+
+void RTTIHelper::InitializeRuntime()
+{
     const auto cpEngine = RED4ext::CGameEngine::Get();
     const auto cpGameInstance = cpEngine->framework->gameInstance;
     const auto cpPlayerSystemType = m_pRtti->GetType(RED4ext::FNV1a64("cpPlayerSystem"));

src/reverse/RTTIHelper.h

@@ -38,6 +38,7 @@ struct RTTIHelper
     std::map<uint64_t, RED4ext::CBaseFunction*> FindFunctions(RED4ext::CClass* apClass, const uint64_t acShortNameHash, bool aIsMember) const;
 
     static void Initialize(const LockableState& acpLua, LuaSandbox& apSandbox);
+    static void PostInitialize();
     static void Shutdown();
     static RTTIHelper& Get();
 
@@ -46,6 +47,7 @@ struct RTTIHelper
     RTTIHelper(const LockableState& acLua, LuaSandbox& apSandbox);
 
     void InitializeRTTI();
+    void InitializeRuntime();
     void ParseGlobalStatics();
 
     bool IsFunctionAlias(RED4ext::CBaseFunction* apFunc);

src/scripting/Scripting.cpp

@@ -481,6 +481,8 @@ void Scripting::PostInitializeScripting()
 
     m_sandbox.PostInitializeScripting();
 
+    RTTIHelper::Initialize(m_lua.AsRef(), m_sandbox);
+
     TriggerOnHook();
 }
 
@@ -601,6 +603,7 @@ void Scripting::PostInitializeMods()
     globals["Game"] = this;
 
     RTTIExtender::Initialize();
+    RTTIHelper::PostInitialize();
     m_mapper.Register();
 
     RegisterOverrides();