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

Joystick:getID now returns the Joystick's instance id as a second argument, if the Joystick is connected.

Browse Source 
The Joystick gets a new unique instance id every time it's connected.
This commit is contained in:
Alex Szpakowski
2013-08-28 05:23:02 -03:00
parent 4fcf47a427
commit 3f6b280d54
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/joystick/sdl/wrap_Joystick.cpp
+11 -2
View File
@@ -53,8 +53,17 @@ int w_Joystick_getName(lua_State *L)
int w_Joystick_getID(lua_State *L) int w_Joystick_getID(lua_State *L)
{ {
Joystick *j = luax_checkjoystick(L, 1); Joystick *j = luax_checkjoystick(L, 1);
lua_pushinteger(L, j->getID() + 1); // IDs are 1-based in Lua.
return 1; // IDs are 1-based in Lua.
lua_pushinteger(L, j->getID() + 1);
int instanceid = j->getInstanceID();
if (instanceid >= 0)
lua_pushinteger(L, instanceid + 1);
else
lua_pushnil(L);
return 2;
} }
int w_Joystick_getProductGUID(lua_State *L) int w_Joystick_getProductGUID(lua_State *L)