Skip to content

Refactor isResourceProtected to use the new parser #1482

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 31, 2020
Merged

Refactor isResourceProtected to use the new parser #1482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 3 additions & 13 deletions Server/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ void CLuaResourceDefs::LoadFunctions()
{"getResourceExportedFunctions", getResourceExportedFunctions},
{"getResourceOrganizationalPath", getResourceOrganizationalPath},
{"isResourceArchived", isResourceArchived},
{"isResourceProtected", isResourceProtected},
{"isResourceProtected", ArgumentParser<isResourceProtected>},

// Set stuff
{"setResourceInfo", setResourceInfo},
Expand Down Expand Up @@ -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();
}
2 changes: 1 addition & 1 deletion Server/mods/deathmatch/logic/luadefs/CLuaResourceDefs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down