Revert "Global variable and default value for resource names (#3363)"

This reverts commit cd88950.
The changes in the commit primarily broke map editor and other resources.

Author: botder

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

@@ -170,9 +170,6 @@ 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

@@ -10,8 +10,6 @@
  *****************************************************************************/
 
 #include "StdInc.h"
-#include <lua/CLuaFunctionParser.h>
-
 using std::list;
 
 void CLuaResourceDefs::LoadFunctions()
@@ -20,7 +18,7 @@ void CLuaResourceDefs::LoadFunctions()
         {"call", Call},
         {"getThisResource", GetThisResource},
         {"getResourceConfig", GetResourceConfig},
-        {"getResourceName", ArgumentParserWarn<false, GetResourceName>},
+        {"getResourceName", GetResourceName},
         {"getResourceFromName", GetResourceFromName},
         {"getResourceRootElement", GetResourceRootElement},
         {"getResourceGUIElement", GetResourceGUIElement},
@@ -222,24 +220,34 @@ int CLuaResourceDefs::GetResourceConfig(lua_State* luaVM)
     return 1;
 }
 
-std::string CLuaResourceDefs::GetResourceName(lua_State* luaVM, std::optional<CResource*> resourceElement)
+int CLuaResourceDefs::GetResourceName(lua_State* luaVM)
 {
-    if (resourceElement && resourceElement.has_value())
+    // Verify arguments
+    CResource*       pResource = NULL;
+    CScriptArgReader argStream(luaVM);
+    argStream.ReadUserData(pResource);
+
+    if (!argStream.HasErrors())
     {
-        return (*resourceElement)->GetName();
+        if (pResource)
+        {
+            // Grab its name and return it
+            const char* szName = pResource->GetName();
+            if (szName)
+            {
+                lua_pushstring(luaVM, szName);
+                return 1;
+            }
+        }
+        else
+            m_pScriptDebugging->LogBadPointer(luaVM, "resource", 1);
     }
+    else
+        m_pScriptDebugging->LogCustom(luaVM, argStream.GetFullErrorMessage());
 
-    CLuaMain* localVM = m_pLuaManager->GetVirtualMachine(luaVM);
-
-    if (!localVM)
-        throw std::invalid_argument("Couldn't find the virtual machine");
-
-    CResource* localResource = localVM->GetResource();
-
-    if (!localResource)
-        throw std::invalid_argument("Couldn't find the resource");
-
-    return localResource->GetName();
+    // Failed
+    lua_pushboolean(luaVM, false);
+    return 1;
 }
 
 int CLuaResourceDefs::GetResourceFromName(lua_State* luaVM)

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

@@ -21,6 +21,7 @@ class CLuaResourceDefs : public CLuaDefs
     LUA_DECLARE(Call);
     LUA_DECLARE(GetThisResource);
     LUA_DECLARE(GetResourceConfig);
+    LUA_DECLARE(GetResourceName);
     LUA_DECLARE(GetResourceFromName);
     LUA_DECLARE(GetResourceRootElement);
     LUA_DECLARE(GetResourceGUIElement);
@@ -29,6 +30,4 @@ class CLuaResourceDefs : public CLuaDefs
     LUA_DECLARE(GetResourceState);
     LUA_DECLARE(LoadString);
     LUA_DECLARE(Load);
-
-    static std::string GetResourceName(lua_State* luaVM, std::optional<CResource*> resourceElement);
 };

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

@@ -234,9 +234,6 @@ 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

@@ -54,7 +54,7 @@ void CLuaResourceDefs::LoadFunctions()
         {"getResourceLoadFailureReason", getResourceLoadFailureReason},
         {"getResourceLastStartTime", getResourceLastStartTime},
         {"getResourceLoadTime", getResourceLoadTime},
-        {"getResourceName", ArgumentParserWarn<false, GetResourceName>},
+        {"getResourceName", getResourceName},
         {"getResourceRootElement", getResourceRootElement},
         {"getResourceDynamicElementRoot", getResourceDynamicElementRoot},
         {"getResourceMapRootElement", getResourceMapRootElement},
@@ -898,30 +898,23 @@ int CLuaResourceDefs::getResourceLoadTime(lua_State* luaVM)
     return 1;
 }
 
-std::string CLuaResourceDefs::GetResourceName(lua_State* luaVM, std::optional<CResource*> resourceElement)
+int CLuaResourceDefs::getResourceName(lua_State* luaVM)
 {
-    if (resourceElement && resourceElement.has_value())
-    {
-        if (!(*resourceElement)->IsActive())
-            throw std::invalid_argument("The resource isn't active");
-
-        return (*resourceElement)->GetName();
-    }
-
-    CLuaMain* localVM = m_pLuaManager->GetVirtualMachine(luaVM);
-
-    if (!localVM)
-        throw std::invalid_argument("Couldn't find the virtual machine");
-
-    CResource* localResource = localVM->GetResource();
+    CResource* pResource;
 
-    if (!localResource)
-        throw std::invalid_argument("Couldn't find the resource");
+    CScriptArgReader argStream(luaVM);
+    argStream.ReadUserData(pResource);
 
-    if (!localResource->IsActive())
-        throw std::invalid_argument("The resource isn't active");
+    if (!argStream.HasErrors())
+    {
+        lua_pushstring(luaVM, pResource->GetName().c_str());
+        return 1;
+    }
+    else
+        m_pScriptDebugging->LogCustom(luaVM, argStream.GetFullErrorMessage());
 
-    return localResource->GetName();
+    lua_pushboolean(luaVM, false);
+    return 1;
 }
 
 int CLuaResourceDefs::getResourceRootElement(lua_State* luaVM)

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

@@ -47,15 +47,14 @@ class CLuaResourceDefs : public CLuaDefs
     LUA_DECLARE(getResourceLoadFailureReason);
     LUA_DECLARE(getResourceLastStartTime);
     LUA_DECLARE(getResourceLoadTime);
+    LUA_DECLARE(getResourceName);
     LUA_DECLARE(getResourceRootElement);
     LUA_DECLARE(getResourceDynamicElementRoot);
     LUA_DECLARE(getResourceMapRootElement);
     LUA_DECLARE(getResourceExportedFunctions);
     LUA_DECLARE(getResourceOrganizationalPath);
     LUA_DECLARE(isResourceArchived);
-
     static bool isResourceProtected(CResource* const resource);
-    static std::string GetResourceName(lua_State* luaVM, std::optional<CResource*> resourceElement);
 
     // Set stuff
     LUA_DECLARE(setResourceInfo);