yolinlin/mod-ale
1
0
Fork 0
mirror of https://github.com/azerothcore/mod-ale synced 2025-11-29 15:38:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move objects from global table to internal registery

Browse Source
This commit is contained in:
Rochet2
2016-02-24 23:01:11 +02:00
parent 849d26e3a0
commit d162ae4105
2 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ElunaTemplate.h
View File

@@ -148,7 +148,7 @@ public:
manageMemory = gc; manageMemory = gc;
// create metatable for userdata of this type // create metatable for userdata of this type
lua_newtable(E->L); luaL_newmetatable(E->L, tname);
int metatable = lua_gettop(E->L); int metatable = lua_gettop(E->L);
// push methodtable to stack to be accessed and modified by users // push methodtable to stack to be accessed and modified by users
@@ -239,7 +239,8 @@ public:
ASSERT(methodTable); ASSERT(methodTable);
// get metatable // get metatable
lua_getglobal(E->L, tname); lua_pushstring(E->L, tname);
lua_rawget(E->L, LUA_REGISTRYINDEX);
ASSERT(lua_istable(E->L, -1)); ASSERT(lua_istable(E->L, -1));
for (; methodTable && methodTable->name && methodTable->mfunc; ++methodTable) for (; methodTable && methodTable->name && methodTable->mfunc; ++methodTable)
@@ -264,7 +265,8 @@ public:
void* obj_voidptr = static_cast<void*>(const_cast<T*>(obj)); void* obj_voidptr = static_cast<void*>(const_cast<T*>(obj));
lua_getglobal(L, ELUNA_OBJECT_STORE); lua_pushstring(L, ELUNA_OBJECT_STORE);
lua_rawget(L, LUA_REGISTRYINDEX);
ASSERT(lua_istable(L, -1)); ASSERT(lua_istable(L, -1));
lua_pushlightuserdata(L, obj_voidptr); lua_pushlightuserdata(L, obj_voidptr);
lua_rawget(L, -2); lua_rawget(L, -2);
@@ -292,7 +294,8 @@ public:
*ptrHold = new ElunaObject(const_cast<T*>(obj), manageMemory); *ptrHold = new ElunaObject(const_cast<T*>(obj), manageMemory);
// Set metatable for it // Set metatable for it
lua_getglobal(L, tname); lua_pushstring(L, tname);
lua_rawget(L, LUA_REGISTRYINDEX);
if (!lua_istable(L, -1)) if (!lua_istable(L, -1))
{ {
ELUNA_LOG_ERROR("%s missing metatable", tname); ELUNA_LOG_ERROR("%s missing metatable", tname);
@@ -384,7 +387,7 @@ public:
static int ToString(lua_State* L) static int ToString(lua_State* L)
{ {
T* obj = Eluna::CHECKOBJ<T>(L, 1, true); // get self T* obj = Eluna::CHECKOBJ<T>(L, 1, true); // get self
lua_pushfstring(L, "%s: (%p)", tname, obj); lua_pushfstring(L, "%s: %p", tname, obj);
return 1; return 1;
} }

5
LuaEngine.cpp
View File

@@ -242,7 +242,7 @@ void Eluna::OpenLua()
lua_pushstring(L, "v"); lua_pushstring(L, "v");
lua_setfield(L, -2, "__mode"); lua_setfield(L, -2, "__mode");
lua_setmetatable(L, -2); lua_setmetatable(L, -2);
lua_setglobal(L, ELUNA_OBJECT_STORE); lua_setfield(L, LUA_REGISTRYINDEX, ELUNA_OBJECT_STORE);
// Set lua require folder paths (scripts folder structure) // Set lua require folder paths (scripts folder structure)
lua_getglobal(L, "package"); lua_getglobal(L, "package");
@@ -534,7 +534,8 @@ void Eluna::RunScripts()
void Eluna::InvalidateObjects() void Eluna::InvalidateObjects()
{ {
lua_getglobal(L, ELUNA_OBJECT_STORE); lua_pushstring(L, ELUNA_OBJECT_STORE);
lua_rawget(L, LUA_REGISTRYINDEX);
ASSERT(lua_istable(L, -1)); ASSERT(lua_istable(L, -1));
lua_pushnil(L); lua_pushnil(L);