Load embedded scripts in a separate step

Author: botder

Client/mods/deathmatch/logic/CResource.cpp

@@ -83,6 +83,7 @@ CResource::CResource(unsigned short usNetID, const char* szResourceName, CClient
     if (m_pLuaVM)
     {
         m_pLuaVM->SetScriptName(szResourceName);
+        m_pLuaVM->LoadEmbeddedScripts();
     }
 }
 

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

@@ -182,8 +182,10 @@ void CLuaMain::InitVM()
 
     lua_pushelement(m_luaVM, g_pClientGame->GetLocalPlayer());
     lua_setglobal(m_luaVM, "localPlayer");
+}
 
-    // Load pre-loaded lua scripts
+void CLuaMain::LoadEmbeddedScripts()
+{
     DECLARE_PROFILER_SECTION(OnPreLoadScript)
     LoadScript(EmbeddedLuaCode::exports);
     LoadScript(EmbeddedLuaCode::coroutine_debug);

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

@@ -72,6 +72,7 @@ class CLuaMain            //: public CClient
 
     void           InitClasses(lua_State* luaVM);
     void           InitVM();
+    void           LoadEmbeddedScripts();
     const SString& GetFunctionTag(int iLuaFunction);
     int            PCall(lua_State* L, int nargs, int nresults, int errfunc);
     static int     LuaLoadBuffer(lua_State* L, const char* buff, size_t sz, const char* name);

Server/mods/deathmatch/logic/CResource.cpp

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

Server/mods/deathmatch/logic/CResourceHTMLItem.cpp

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

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

@@ -207,8 +207,10 @@ void CLuaMain::InitVM()
 
     lua_pushelement(m_luaVM, m_pResource->GetResourceRootElement());
     lua_setglobal(m_luaVM, "resourceRoot");
+}
 
-    // Load pre-loaded lua scripts
+void CLuaMain::LoadEmbeddedScripts()
+{
     LoadScript(EmbeddedLuaCode::exports);
     LoadScript(EmbeddedLuaCode::coroutine_debug);
     LoadScript(EmbeddedLuaCode::inspect);

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

@@ -103,6 +103,7 @@ class CLuaMain            //: public CClient
     void RegisterHTMLDFunctions();
 
     void           InitVM();
+    void           LoadEmbeddedScripts();
     const SString& GetFunctionTag(int iFunctionNumber);
     int            PCall(lua_State* L, int nargs, int nresults, int errfunc);
     void           CheckExecutionTime();