Add server-side isResourceArchived function (#144)

* Added isResourceZip Function serverside * Changed isResourceZip to isResourceArchived
multitheftauto · Jul 3, 2017 · 6697ca9 · 6697ca9
1 parent c12aea3
commit 6697ca9
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp b/Server/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp
@@ -56,6 +56,7 @@ void CLuaResourceDefs::LoadFunctions ( void )
     CLuaCFunctions::AddFunction ( "getResourceMapRootElement", getResourceMapRootElement );
     CLuaCFunctions::AddFunction ( "getResourceExportedFunctions", getResourceExportedFunctions );
     CLuaCFunctions::AddFunction ( "getResourceOrganizationalPath", getResourceOrganizationalPath);
+    CLuaCFunctions::AddFunction ( "isResourceArchived", isResourceArchived );
 
     // Set stuff
     CLuaCFunctions::AddFunction ( "setResourceInfo", setResourceInfo );
@@ -116,6 +117,7 @@ void CLuaResourceDefs::AddClass ( lua_State* luaVM )
     lua_classfunction ( luaVM, "getName", "getResourceName" );
     lua_classfunction ( luaVM, "getState", "getResourceState" );
     lua_classfunction ( luaVM, "getACLRequests", "getResourceACLRequests" );
+    lua_classfunction ( luaVM, "isArchived", "isResourceArchived" );
 
     lua_classvariable ( luaVM, "dynamicElementRoot", NULL, "getResourceDynamicElementRoot" );
     lua_classvariable ( luaVM, "exportedFunctions", NULL, "getResourceExportedFunctions" );
@@ -126,6 +128,7 @@ void CLuaResourceDefs::AddClass ( lua_State* luaVM )
     lua_classvariable ( luaVM, "name", "renameResource", "getResourceName" );
     lua_classvariable ( luaVM, "rootElement", NULL, "getResourceRootElement" );
     lua_classvariable ( luaVM, "state", NULL, "getResourceState" );
+    lua_classvariable ( luaVM, "archived", NULL, "isResourceArchived" );
     lua_classvariable ( luaVM, "loadFailureReason", NULL, "getResourceLoadFailureReason" );
     //lua_classvariable ( luaVM, "info", "setResourceInfo", "getResourceInfo", CLuaOOPDefs::SetResourceInfo, CLuaOOPDefs::GetResourceInfo ); // .key[value]
     //lua_classvariable ( luaVM, "defaultSetting", "setResourceDefaultSetting", NULL, CLuaOOPDefs::SetResourceDefaultSetting, NULL ); // .key[value]
@@ -1432,3 +1435,23 @@ int CLuaResourceDefs::Load( lua_State* luaVM )
     lua_pushboolean( luaVM, false );
     return 1;
 }
+
+int CLuaResourceDefs::isResourceArchived (lua_State* luaVM)
+{
+    //  bool isResourceArchived ( resource theResource )
+    CResource* pResource;
+
+    CScriptArgReader argStream(luaVM);
+    argStream.ReadUserData(pResource);
+
+    if (!argStream.HasErrors())
+    {
+        lua_pushboolean ( luaVM, pResource->IsResourceZip() );
+        return 1;
+    }
+    else
+        m_pScriptDebugging->LogCustom(luaVM, argStream.GetFullErrorMessage());
+
+    lua_pushboolean ( luaVM, false );
+    return 1;
+}
diff --git a/Server/mods/deathmatch/logic/luadefs/CLuaResourceDefs.h b/Server/mods/deathmatch/logic/luadefs/CLuaResourceDefs.h
@@ -58,6 +58,7 @@ class CLuaResourceDefs: public CLuaDefs
     LUA_DECLARE ( getResourceMapRootElement );
     LUA_DECLARE ( getResourceExportedFunctions );
     LUA_DECLARE ( getResourceOrganizationalPath );
+    LUA_DECLARE ( isResourceArchived );
 
     // Set stuff
     LUA_DECLARE ( setResourceInfo );