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

Merged default into minor

Browse Source 
--HG--
branch : minor
This commit is contained in:
Alex Szpakowski
2014-06-05 03:02:50 -03:00
parent e0f045c310 ddb9997ead
commit bfa3ec9369
68 changed files with 1439 additions and 524 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/mouse/wrap_Mouse.cpp
+3 -3
View File
@@ -43,7 +43,7 @@ int w_newCursor(lua_State *L)
int hotx = luaL_optint(L, 2, 0);
int hoty = luaL_optint(L, 3, 0);
EXCEPT_GUARD(cursor = instance->newCursor(data, hotx, hoty);)
luax_catchexcept(L, [&](){ cursor = instance->newCursor(data, hotx, hoty); });
luax_pushtype(L, "Cursor", MOUSE_CURSOR_T, cursor);
return 1;
@@ -58,7 +58,7 @@ int w_getSystemCursor(lua_State *L)
return luaL_error(L, "Invalid system cursor type: %s", str);
Cursor *cursor = 0;
EXCEPT_GUARD(cursor = instance->getSystemCursor(systemCursor);)
luax_catchexcept(L, [&](){ cursor = instance->getSystemCursor(systemCursor); });
cursor->retain();
luax_pushtype(L, "Cursor", MOUSE_CURSOR_T, cursor);
@@ -214,7 +214,7 @@ extern "C" int luaopen_love_mouse(lua_State *L)
{
if (instance == nullptr)
{
EXCEPT_GUARD(instance = new love::mouse::sdl::Mouse();)
luax_catchexcept(L, [&](){ instance = new love::mouse::sdl::Mouse(); });
}
else
instance->retain();