aboutsummaryrefslogtreecommitdiff
path: root/src/lua/modules/event
diff options
context:
space:
mode:
Diffstat (limited to 'src/lua/modules/event')
-rw-r--r--src/lua/modules/event/je_lua_event.cpp (renamed from src/lua/modules/event/event.cpp)26
-rw-r--r--src/lua/modules/event/je_lua_event.h0
2 files changed, 13 insertions, 13 deletions
diff --git a/src/lua/modules/event/event.cpp b/src/lua/modules/event/je_lua_event.cpp
index 9f565d0..82ba385 100644
--- a/src/lua/modules/event/event.cpp
+++ b/src/lua/modules/event/je_lua_event.cpp
@@ -1,21 +1,22 @@
/**
* Event module
*/
+#include "lua/common/je_lua_common.h"
#include "lua/modules/luax.h"
#include "libjin/jin.h"
+using namespace JinEngine;
+using namespace JinEngine::Input;
+
namespace JinEngine
{
namespace Lua
{
- using namespace JinEngine;
- using namespace JinEngine::Input;
-
/**
* Load event poll, return a iterator(a table).
*/
- static int l_event_poll(lua_State *L)
+ LUA_IMPLEMENT int l_event_poll(lua_State *L)
{
/* table to store events */
luax_newtable(L);
@@ -100,10 +101,9 @@ namespace JinEngine
case EventType::CONTROLLERAXISMOTION:
-
default:
- /* ignore other events */
- luax_pop(L, 1); // pop table out
+ // Ignore oter events and pop up the event table.
+ luax_pop(L, 1);
goto poll;
break;
}
@@ -111,18 +111,18 @@ namespace JinEngine
}
return 1;
}
-
- static const luaL_Reg f[] = {
- { "poll", l_event_poll },
- { 0, 0 }
- };
/**
* load event module
*/
- int luaopen_event(lua_State* L)
+ LUA_EXPORT int luaopen_event(lua_State* L)
{
+ luaL_Reg f[] = {
+ { "poll", l_event_poll },
+ { 0, 0 }
+ };
luax_newlib(L, f);
+
return 1;
}
diff --git a/src/lua/modules/event/je_lua_event.h b/src/lua/modules/event/je_lua_event.h
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/lua/modules/event/je_lua_event.h