Register module functions in a separate step

Author: botder

Server/mods/deathmatch/logic/CResource.cpp

@@ -1107,6 +1107,7 @@ bool CResource::CreateVM(bool bEnableOOP)
 
     m_pVM->SetScriptName(m_strResourceName.c_str());
     m_pVM->LoadEmbeddedScripts();
+    m_pVM->RegisterModuleFunctions();
     return true;
 }
 

Server/mods/deathmatch/logic/CResourceHTMLItem.cpp

@@ -294,6 +294,7 @@ bool CResourceHTMLItem::Start()
 
         m_pVM = g_pGame->GetLuaManager()->CreateVirtualMachine(m_resource, m_bOOPEnabled);
         m_pVM->LoadEmbeddedScripts();
+        m_pVM->RegisterModuleFunctions();
         m_pVM->LoadScript(strScript.c_str());
         m_pVM->SetResourceFile(this);
         m_pVM->RegisterHTMLDFunctions();

Server/mods/deathmatch/logic/lua/CLuaMain.cpp

@@ -167,7 +167,7 @@ void CLuaMain::InitClasses(lua_State* luaVM)
     CLuaShared::AddClasses(luaVM);
 }
 
-void CLuaMain::InitVM()
+void CLuaMain::Initialize()
 {
     assert(!m_luaVM);
 
@@ -216,6 +216,11 @@ void CLuaMain::LoadEmbeddedScripts()
     LoadScript(EmbeddedLuaCode::inspect);
 }
 
+void CLuaMain::RegisterModuleFunctions()
+{
+    m_pLuaManager->GetLuaModuleManager()->RegisterFunctions(m_luaVM);
+}
+
 // Special function(s) that are only visible to HTMLD scripts
 void CLuaMain::RegisterHTMLDFunctions()
 {

Server/mods/deathmatch/logic/lua/CLuaMain.h

@@ -102,8 +102,9 @@ class CLuaMain            //: public CClient
 
     void RegisterHTMLDFunctions();
 
-    void           InitVM();
+    void           Initialize();
     void           LoadEmbeddedScripts();
+    void           RegisterModuleFunctions();
     const SString& GetFunctionTag(int iFunctionNumber);
     int            PCall(lua_State* L, int nargs, int nresults, int errfunc);
     void           CheckExecutionTime();

Server/mods/deathmatch/logic/lua/CLuaManager.cpp

@@ -63,9 +63,7 @@ CLuaMain* CLuaManager::CreateVirtualMachine(CResource* pResourceOwner, bool bEna
     CLuaMain* pLuaMain = new CLuaMain(this, m_pObjectManager, m_pPlayerManager, m_pVehicleManager, m_pBlipManager, m_pRadarAreaManager, m_pMapManager,
                                       pResourceOwner, bEnableOOP);
     m_virtualMachines.push_back(pLuaMain);
-    pLuaMain->InitVM();
-
-    m_pLuaModuleManager->RegisterFunctions(pLuaMain->GetVirtualMachine());
+    pLuaMain->Initialize();
 
     return pLuaMain;
 }

Server/mods/deathmatch/logic/lua/CLuaManager.h

@@ -43,7 +43,7 @@ class CLuaManager
     void       OnLuaMainOpenVM(CLuaMain* pLuaMain, lua_State* luaVM);
     void       OnLuaMainCloseVM(CLuaMain* pLuaMain, lua_State* luaVM);
 
-    CLuaModuleManager* GetLuaModuleManager() const { return m_pLuaModuleManager; };
+    CLuaModuleManager* GetLuaModuleManager() const { return m_pLuaModuleManager; }
 
     list<CLuaMain*>::const_iterator IterBegin() { return m_virtualMachines.begin(); };
     list<CLuaMain*>::const_iterator IterEnd() { return m_virtualMachines.end(); };