From fb8a274a88a79e4e8fac8501c8f1e9781da979eb Mon Sep 17 00:00:00 2001
From: Pirulax <patrikjankovics7@gmail.com>
Date: Fri, 22 May 2020 06:53:27 +0200
Subject: [PATCH] refactor isResourceProtected to use the new parser

---
 .../logic/luadefs/CLuaResourceDefs.cpp           | 16 +++-------------
 .../deathmatch/logic/luadefs/CLuaResourceDefs.h  |  2 +-
 2 files changed, 4 insertions(+), 14 deletions(-)

diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp
index 2208f4454c3..7613e7e20be 100644
--- a/Server/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp
+++ b/Server/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp
@@ -53,7 +53,7 @@ void CLuaResourceDefs::LoadFunctions()
         {"getResourceExportedFunctions", getResourceExportedFunctions},
         {"getResourceOrganizationalPath", getResourceOrganizationalPath},
         {"isResourceArchived", isResourceArchived},
-        {"isResourceProtected", isResourceProtected},
+        {"isResourceProtected", ArgumentParser<isResourceProtected>},
 
         // Set stuff
         {"setResourceInfo", setResourceInfo},
@@ -1464,17 +1464,7 @@ int CLuaResourceDefs::isResourceArchived(lua_State* luaVM)
     return 1;
 }
 
-int CLuaResourceDefs::isResourceProtected(lua_State* luaVM)
+bool CLuaResourceDefs::isResourceProtected(CResource* const resource)
 {
-    //  bool isResourceProtected ( resource theResource )
-    CResource* pResource;
-
-    CScriptArgReader argStream(luaVM);
-    argStream.ReadUserData(pResource);
-
-    if (argStream.HasErrors())
-        return luaL_error(luaVM, argStream.GetFullErrorMessage());
-
-    lua_pushboolean(luaVM, pResource->IsProtected());
-    return 1;
+    return resource->IsProtected();
 }
diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaResourceDefs.h b/Server/mods/deathmatch/logic/luadefs/CLuaResourceDefs.h
index 6233385c934..471b7aaef9d 100644
--- a/Server/mods/deathmatch/logic/luadefs/CLuaResourceDefs.h
+++ b/Server/mods/deathmatch/logic/luadefs/CLuaResourceDefs.h
@@ -54,7 +54,7 @@ class CLuaResourceDefs : public CLuaDefs
     LUA_DECLARE(getResourceExportedFunctions);
     LUA_DECLARE(getResourceOrganizationalPath);
     LUA_DECLARE(isResourceArchived);
-    LUA_DECLARE(isResourceProtected);
+    static bool isResourceProtected(CResource* const resource);
 
     // Set stuff
     LUA_DECLARE(setResourceInfo);