Skip to content

Add resourceDynamicRoot global variable and refactor GetResourceDynamicElementRoot #3539

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

Closed
wants to merge 19 commits into from
Closed

Add resourceDynamicRoot global variable and refactor GetResourceDynamicElementRoot #3539

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
291ee4f
Add resourceDynamicRoot
TracerDS Jul 2, 2024
7defc2b
Merge branch 'master' into 020724_ResourceDynamicRoot
TracerDS Jul 2, 2024
da24aab
Fix build
TracerDS Jul 2, 2024
463be80
Updated according to reviews
TracerDS Jul 7, 2024
84508cf
Update CLuaResourceDefs.cpp
TracerDS Jul 7, 2024
5cdabcd
Merge branch 'master' into 020724_ResourceDynamicRoot
TracerDS Jul 10, 2024
e986aba
Merge branch 'master' into 020724_ResourceDynamicRoot
TracerDS Jul 11, 2024
1455cce
Merge branch 'master' into 020724_ResourceDynamicRoot
TracerDS Jul 14, 2024
c8a2b01
Merge branch 'master' into 020724_ResourceDynamicRoot
TracerDS Jul 15, 2024
c1f37b1
Merge branch 'master' into 020724_ResourceDynamicRoot
TracerDS Jul 15, 2024
c7cfa53
Changed according to reviews
TracerDS Jul 16, 2024
d30666d
Merge branch 'master' into 020724_ResourceDynamicRoot
TracerDS Jul 16, 2024
c11706c
Merge branch 'master' into 020724_ResourceDynamicRoot
TracerDS Jul 19, 2024
ab813e9
Merge branch 'master' into 020724_ResourceDynamicRoot
TracerDS Jul 28, 2024
991c73c
Merge branch 'master' into 020724_ResourceDynamicRoot
TracerDS Jul 31, 2024
0f34d7a
Merge branch 'master' into 020724_ResourceDynamicRoot
TracerDS Aug 20, 2024
8784d9a
Merge branch 'master' into 020724_ResourceDynamicRoot
TracerDS Aug 23, 2024
1af8382
Merge branch 'master' into 020724_ResourceDynamicRoot
TracerDS Oct 17, 2024
264dc92
Merge branch 'master' into 020724_ResourceDynamicRoot
TracerDS Nov 13, 2024
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
3 changes: 3 additions & 0 deletions Client/mods/deathmatch/logic/lua/CLuaMain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,9 @@ void CLuaMain::InitVM()
lua_pushelement(m_luaVM, m_pResource->GetResourceEntity());
lua_setglobal(m_luaVM, "resourceRoot");

lua_pushelement(m_luaVM, m_pResource->GetResourceDynamicEntity());
lua_setglobal(m_luaVM, "resourceDynamicRoot");

lua_pushelement(m_luaVM, m_pResource->GetResourceGUIEntity());
lua_setglobal(m_luaVM, "guiRoot");

Expand Down
28 changes: 9 additions & 19 deletions Client/mods/deathmatch/logic/luadefs/CLuaResourceDefs.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
*****************************************************************************/

#include "StdInc.h"
#include <lua/CLuaFunctionParser.h>
using std::list;

void CLuaResourceDefs::LoadFunctions()
Expand All @@ -22,7 +23,7 @@ void CLuaResourceDefs::LoadFunctions()
{"getResourceFromName", GetResourceFromName},
{"getResourceRootElement", GetResourceRootElement},
{"getResourceGUIElement", GetResourceGUIElement},
{"getResourceDynamicElementRoot", GetResourceDynamicElementRoot},
{"getResourceDynamicElementRoot", ArgumentParser<GetResourceDynamicElementRoot>},
{"getResourceExportedFunctions", GetResourceExportedFunctions},
{"getResourceState", GetResourceState},
{"loadstring", LoadString},
Expand Down Expand Up @@ -352,28 +353,17 @@ int CLuaResourceDefs::GetResourceGUIElement(lua_State* luaVM)
return 1;
}

int CLuaResourceDefs::GetResourceDynamicElementRoot(lua_State* luaVM)
CClientEntity* CLuaResourceDefs::GetResourceDynamicElementRoot(lua_State* luaVM, std::optional<CResource*> resource)
{
CResource* pResource = NULL;
CScriptArgReader argStream(luaVM);
argStream.ReadUserData(pResource);
CResource* pResource = resource.value_or(&lua_getownerresource(luaVM));

if (!argStream.HasErrors())
CClientEntity* resourceDynamicRoot = pResource->GetResourceDynamicEntity();
if (!resourceDynamicRoot)
{
CClientEntity* pEntity = pResource->GetResourceDynamicEntity();
if (pEntity)
{
lua_pushelement(luaVM, pEntity);
return 1;
}
else
m_pScriptDebugging->LogError(luaVM, "getResourceDynamicElementRoot: Resource %s Is Not Currently Running", pResource->GetName());
SString err("Resource \"%s\" is not currently running!", pResource->GetName());
throw LuaFunctionError(err, false);
}
else
m_pScriptDebugging->LogCustom(luaVM, argStream.GetFullErrorMessage());

lua_pushboolean(luaVM, false);
return 1;
return resourceDynamicRoot;
}

int CLuaResourceDefs::GetResourceExportedFunctions(lua_State* luaVM)
Expand Down
2 changes: 1 addition & 1 deletion Client/mods/deathmatch/logic/luadefs/CLuaResourceDefs.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ class CLuaResourceDefs : public CLuaDefs
LUA_DECLARE(GetResourceFromName);
LUA_DECLARE(GetResourceRootElement);
LUA_DECLARE(GetResourceGUIElement);
LUA_DECLARE(GetResourceDynamicElementRoot);
static CClientEntity* GetResourceDynamicElementRoot(lua_State* luaVM, std::optional<CResource*> resource);
LUA_DECLARE(GetResourceExportedFunctions);
LUA_DECLARE(GetResourceState);
LUA_DECLARE(LoadString);
Expand Down
3 changes: 3 additions & 0 deletions Server/mods/deathmatch/logic/lua/CLuaMain.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,6 +234,9 @@ void CLuaMain::Initialize()

lua_pushelement(m_luaVM, m_pResource->GetResourceRootElement());
lua_setglobal(m_luaVM, "resourceRoot");

lua_pushelement(m_luaVM, m_pResource->GetDynamicElementRoot());
lua_setglobal(m_luaVM, "resourceDynamicRoot");
}

void CLuaMain::LoadEmbeddedScripts()
Expand Down
47 changes: 7 additions & 40 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 @@ -56,7 +56,7 @@ void CLuaResourceDefs::LoadFunctions()
{"getResourceLoadTime", getResourceLoadTime},
{"getResourceName", getResourceName},
{"getResourceRootElement", getResourceRootElement},
{"getResourceDynamicElementRoot", getResourceDynamicElementRoot},
{"getResourceDynamicElementRoot", ArgumentParser<GetResourceDynamicElementRoot>},
{"getResourceMapRootElement", getResourceMapRootElement},
{"getResourceExportedFunctions", getResourceExportedFunctions},
{"getResourceOrganizationalPath", getResourceOrganizationalPath},
Expand Down Expand Up @@ -960,49 +960,16 @@ int CLuaResourceDefs::getResourceRootElement(lua_State* luaVM)
return 1;
}

int CLuaResourceDefs::getResourceDynamicElementRoot(lua_State* luaVM)
CElement* CLuaResourceDefs::GetResourceDynamicElementRoot(lua_State* luaVM, std::optional<CResource*> resource)
{
CResource* pResource;

CScriptArgReader argStream(luaVM);
argStream.ReadUserData(pResource, NULL);

if (!argStream.HasErrors())
CResource* pResource = resource.value_or(&lua_getownerresource(luaVM));
if (!pResource || !pResource->IsActive())
{
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())
{
CElement* pElement = pResource->GetDynamicElementRoot();
if (pElement)
{
lua_pushelement(luaVM, pElement);
return 1;
}
}
else
m_pScriptDebugging->LogError(luaVM, "%s: Resource %s is not currently running", lua_tostring(luaVM, lua_upvalueindex(1)),
pResource->GetName().c_str());
SString err("Resource \"%s\" is not currently running!", pResource->GetName().c_str());
throw LuaFunctionError(err, false);
}
else
m_pScriptDebugging->LogCustom(luaVM, argStream.GetFullErrorMessage());

lua_pushboolean(luaVM, false);
return 1;
return pResource->GetDynamicElementRoot();
}

int CLuaResourceDefs::getResourceMapRootElement(lua_State* luaVM)
Expand Down
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 @@ -49,7 +49,7 @@ class CLuaResourceDefs : public CLuaDefs
LUA_DECLARE(getResourceLoadTime);
LUA_DECLARE(getResourceName);
LUA_DECLARE(getResourceRootElement);
LUA_DECLARE(getResourceDynamicElementRoot);
static CElement* GetResourceDynamicElementRoot(lua_State* luaVM, std::optional<CResource*> resource);
LUA_DECLARE(getResourceMapRootElement);
LUA_DECLARE(getResourceExportedFunctions);
LUA_DECLARE(getResourceOrganizationalPath);
Expand Down