Global variable and default value for resource names

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

@@ -170,6 +170,9 @@ void CLuaMain::InitVM()
     lua_pushelement(m_luaVM, m_pResource->GetResourceEntity());
     lua_setglobal(m_luaVM, "resourceRoot");
 
+    lua_pushstring(m_luaVM, m_pResource->GetName());
+    lua_setglobal(m_luaVM, "resourceName");
+
     lua_pushelement(m_luaVM, m_pResource->GetResourceGUIEntity());
     lua_setglobal(m_luaVM, "guiRoot");
 

Client/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp

@@ -223,12 +223,22 @@ int CLuaResourceDefs::GetResourceConfig(lua_State* luaVM)
 int CLuaResourceDefs::GetResourceName(lua_State* luaVM)
 {
     // Verify arguments
-    CResource*       pResource = NULL;
+    CResource* pResource;
     CScriptArgReader argStream(luaVM);
-    argStream.ReadUserData(pResource);
+    argStream.ReadUserData(pResource, nullptr);
 
     if (!argStream.HasErrors())
     {
+        if (!pResource)
+        {
+            // Find our vm and get the root
+            CLuaMain* pLuaMain = m_pLuaManager->GetVirtualMachine(luaVM);
+            if (pLuaMain)
+            {
+                pResource = pLuaMain->GetResource();
+            }
+        }
+
         if (pResource)
         {
             // Grab its name and return it

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

@@ -234,6 +234,9 @@ void CLuaMain::Initialize()
 
     lua_pushelement(m_luaVM, m_pResource->GetResourceRootElement());
     lua_setglobal(m_luaVM, "resourceRoot");
+
+    lua_pushstring(m_luaVM, m_pResource->GetName());
+    lua_setglobal(m_luaVM, "resourceName");
 }
 
 void CLuaMain::LoadEmbeddedScripts()

Server/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp

@@ -901,14 +901,32 @@ int CLuaResourceDefs::getResourceLoadTime(lua_State* luaVM)
 int CLuaResourceDefs::getResourceName(lua_State* luaVM)
 {
     CResource* pResource;
-
     CScriptArgReader argStream(luaVM);
-    argStream.ReadUserData(pResource);
+    argStream.ReadUserData(pResource, nullptr);
 
     if (!argStream.HasErrors())
     {
-        lua_pushstring(luaVM, pResource->GetName().c_str());
-        return 1;
+        if (!pResource)
+        {
+            CLuaMain* pLuaMain = m_pLuaManager->GetVirtualMachine(luaVM);
+            if (pLuaMain)
+            {
+                pResource = pLuaMain->GetResource();
+            }
+
+            // No Lua VM or no assigned resource?
+            if (!pResource)
+            {
+                lua_pushboolean(luaVM, false);
+                return 1;
+            }
+        }
+
+        if (pResource->IsActive())
+        {
+            lua_pushstring(luaVM, pResource->GetName().c_str());
+            return 1;
+        }
     }
     else
         m_pScriptDebugging->LogCustom(luaVM, argStream.GetFullErrorMessage());