sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Lua/LuaClass: Fix parameters sent to Getter/Setter 

Former-commit-id: 7ca17fab640f8fb0c5836f8c1ae6186873d645f2
This commit is contained in:
Lynix 2015-12-10 14:09:13 +01:00
parent 91f778dd89
commit 4a71fb2922
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/Nazara/Lua/LuaClass.inl
View File

@ -271,6 +271,7 @@ namespace Nz
FinalizerFunc finalizer = info->finalizer; FinalizerFunc finalizer = info->finalizer;
T* instance = *static_cast<T**>(lua.CheckUserdata(1, info->name)); T* instance = *static_cast<T**>(lua.CheckUserdata(1, info->name));
lua.Remove(1); //< Remove the instance from the Lua stack
if (!finalizer || finalizer(lua, *instance)) if (!finalizer || finalizer(lua, *instance))
delete instance; delete instance;
@ -301,6 +302,7 @@ namespace Nz
ClassIndexFunc getter = info->getter; ClassIndexFunc getter = info->getter;
T& instance = *(*static_cast<T**>(lua.CheckUserdata(1, info->name))); T& instance = *(*static_cast<T**>(lua.CheckUserdata(1, info->name)));
lua.Remove(1); //< Remove the instance from the Lua stack
if (!getter(lua, instance)) if (!getter(lua, instance))
{ {
@ -323,8 +325,7 @@ namespace Nz
ClassFunc method = info->methods[index]; ClassFunc method = info->methods[index];
T& instance = *(*static_cast<T**>(lua.CheckUserdata(1, info->name))); T& instance = *(*static_cast<T**>(lua.CheckUserdata(1, info->name)));
lua.Remove(1); //< Remove the instance from the Lua stack
lua.Remove(1); // On enlève l'argument "userdata" du stack
return method(lua, instance); return method(lua, instance);
} }
@ -338,13 +339,14 @@ namespace Nz
ClassIndexFunc setter = info->setter; ClassIndexFunc setter = info->setter;
T& instance = *(*static_cast<T**>(lua.CheckUserdata(1, info->name))); T& instance = *(*static_cast<T**>(lua.CheckUserdata(1, info->name)));
lua.Remove(1); //< Remove the instance from the Lua stack
if (!setter(lua, instance)) if (!setter(lua, instance))
{ {
std::size_t length; std::size_t length;
const char* str = lua.ToString(2, &length); const char* str = lua.ToString(2, &length);
lua.Error("Class \"" + info->name + "\" has no field \"" + String(str, length) + ')'); lua.Error("Class \"" + info->name + "\" has no field \"" + String(str, length) + "\")");
} }
return 1; return 1;