aboutsummaryrefslogtreecommitdiff
path: root/src/lua/modules/time
diff options
context:
space:
mode:
Diffstat (limited to 'src/lua/modules/time')
-rw-r--r--src/lua/modules/time/je_lua_time.cpp2
-rw-r--r--src/lua/modules/time/je_lua_timer.cpp18
2 files changed, 10 insertions, 10 deletions
diff --git a/src/lua/modules/time/je_lua_time.cpp b/src/lua/modules/time/je_lua_time.cpp
index 54ab798..6dc6cb5 100644
--- a/src/lua/modules/time/je_lua_time.cpp
+++ b/src/lua/modules/time/je_lua_time.cpp
@@ -1,6 +1,6 @@
#include "SDL2/SDL.h"
#include "common/je_lua_common.h"
-#include "common/je_lua_proxy.h"
+#include "common/je_lua_object.h"
#include "libjin/jin.h"
#include "je_lua_timer.h"
diff --git a/src/lua/modules/time/je_lua_timer.cpp b/src/lua/modules/time/je_lua_timer.cpp
index 570e537..608665b 100644
--- a/src/lua/modules/time/je_lua_timer.cpp
+++ b/src/lua/modules/time/je_lua_timer.cpp
@@ -29,8 +29,8 @@ namespace JinEngine
LUA_IMPLEMENT inline SharedTimer checkTimer(lua_State* L)
{
- Proxy* proxy = (Proxy*)luax_checktype(L, 1, Jin_Lua_Timer);
- return proxy->getShared<Timer>();
+ LuaObject* luaObj = (LuaObject*)luax_checktype(L, 1, Jin_Lua_Timer);
+ return luaObj->getShared<Timer>();
}
// timer:every(time, callback, parameter)
@@ -45,7 +45,7 @@ namespace JinEngine
func->pushParam(i);
Timer::Handler* handler = shared->every(s, timerCallback, func, finishCallback);
Shared<Timer::Handler>* shrHandler = new Shared<Timer::Handler>(L, handler, Jin_Lua_Handler);
- Proxy* proxy = luax_newinstance(L, Jin_Lua_Handler, shrHandler);
+ LuaObject* luaObj = luax_newinstance(L, Jin_Lua_Handler, shrHandler);
return 1;
}
@@ -61,7 +61,7 @@ namespace JinEngine
func->pushParam(i);
Timer::Handler* handler = shared->after(s, timerCallback, func, finishCallback);
Shared<Timer::Handler>* shrHandler = new Shared<Timer::Handler>(L, handler, Jin_Lua_Handler);
- Proxy* proxy = luax_newinstance(L, Jin_Lua_Handler, shrHandler);
+ LuaObject* luaObj = luax_newinstance(L, Jin_Lua_Handler, shrHandler);
return 1;
}
@@ -78,7 +78,7 @@ namespace JinEngine
func->pushParam(i);
Timer::Handler* handler = shared->repeat(s, count, timerCallback, func, finishCallback);
Shared<Timer::Handler>* shrHandler = new Shared<Timer::Handler>(L, handler, Jin_Lua_Handler);
- Proxy* proxy = luax_newinstance(L, Jin_Lua_Handler, shrHandler);
+ LuaObject* luaObj = luax_newinstance(L, Jin_Lua_Handler, shrHandler);
return 1;
}
@@ -92,9 +92,9 @@ namespace JinEngine
LUA_IMPLEMENT int l_cancel(lua_State* L)
{
- Proxy* p = (Proxy*)luax_checktype(L, 1, Jin_Lua_Timer);
+ LuaObject* p = (LuaObject*)luax_checktype(L, 1, Jin_Lua_Timer);
Timer* timer = p->getObject<Timer>();
- Proxy* ph = (Proxy*)luax_checktype(L, 2, Jin_Lua_Handler);
+ LuaObject* ph = (LuaObject*)luax_checktype(L, 2, Jin_Lua_Handler);
Timer::Handler* handler = ph->getObject<Timer::Handler>();
timer->cancel(handler);
return 0;
@@ -102,7 +102,7 @@ namespace JinEngine
LUA_IMPLEMENT int l_cancelAll(lua_State* L)
{
- Proxy* p = (Proxy*)luax_checktype(L, 1, Jin_Lua_Timer);
+ LuaObject* p = (LuaObject*)luax_checktype(L, 1, Jin_Lua_Timer);
Timer* timer = p->getObject<Timer>();
timer->cancelAll();
return 0;
@@ -110,7 +110,7 @@ namespace JinEngine
LUA_IMPLEMENT int l_gc(lua_State* L)
{
- Proxy* p = (Proxy*)luax_checktype(L, 1, Jin_Lua_Timer);
+ LuaObject* p = (LuaObject*)luax_checktype(L, 1, Jin_Lua_Timer);
p->release();
return 0;
}