LOVE/love
1
0
Fork 0
mirror of https://github.com/love2d/love.git synced 2026-08-12 08:30:56 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge minor into dynamiccore2

Browse Source 
--HG--
branch : dynamiccore2
This commit is contained in:
Bart van Strien
2016-11-26 22:19:12 +01:00
parent de29986d38 cbba8c40a6
commit 24a7a3d367
61 changed files with 4909 additions and 1720 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/event/wrap_Event.cpp
+6 -5
View File
@@ -53,15 +53,16 @@ int w_poll(lua_State *L)
return 1;
}
int w_pump(lua_State *)
int w_pump(lua_State *L)
{
instance()->pump();
luax_catchexcept(L, [&]() { instance()->pump(); });
return 0;
}
int w_wait(lua_State *L)
{
Message *m = instance()->wait();
Message *m = nullptr;
luax_catchexcept(L, [&]() { m = instance()->wait(); });
if (m)
{
int args = m->toLua(L);
@@ -85,9 +86,9 @@ int w_push(lua_State *L)
return 1;
}
int w_clear(lua_State *)
int w_clear(lua_State *L)
{
instance()->clear();
luax_catchexcept(L, [&]() { instance()->clear(); });
return 0;
}