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

Fixed last commit 

Former-commit-id: 52606380de66987bdaab08e09eeff0632cc66e65
This commit is contained in:
Lynix 2014-04-20 14:21:54 +02:00
parent ff2bf98623
commit c9b7010380
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Nazara/Lua/LuaInstance.cpp
View File

@ -583,7 +583,7 @@ void NzLuaInstance::PushCFunction(NzLuaCFunction func, int upvalueCount)
void NzLuaInstance::PushFunction(NzLuaFunction func) void NzLuaInstance::PushFunction(NzLuaFunction func)
{ {
NzLuaFunction* luaFunc = reinterpret_cast<NzLuaFunction*>(lua_newuserdata(m_state, sizeof(NzLuaFunction))); NzLuaFunction* luaFunc = reinterpret_cast<NzLuaFunction*>(lua_newuserdata(m_state, sizeof(NzLuaFunction)));
*luaFunc = std::move(func); new (luaFunc) NzLuaFunction(std::move(func));
lua_pushcclosure(m_state, ProxyFunc, 1); lua_pushcclosure(m_state, ProxyFunc, 1);
} }
@ -840,8 +840,8 @@ void* NzLuaInstance::MemoryAllocator(void* ud, void* ptr, std::size_t osize, std
int NzLuaInstance::ProxyFunc(lua_State* state) int NzLuaInstance::ProxyFunc(lua_State* state)
{ {
NzLuaFunction* func = static_cast<NzLuaFunction*>(lua_touserdata(state, lua_upvalueindex(1))); NzLuaFunction& func = *static_cast<NzLuaFunction*>(lua_touserdata(state, lua_upvalueindex(1)));
return (*func)(*GetInstance(state)); return func(*GetInstance(state));
} }
void NzLuaInstance::TimeLimiter(lua_State* state, lua_Debug* debug) void NzLuaInstance::TimeLimiter(lua_State* state, lua_Debug* debug)