Commits

Alex Szpakowski committed 77ef849

Joystick:getID now returns the Joystick's instance id as a second argument, if the Joystick is connected.
The Joystick gets a new unique instance id every time it's connected.

Comments (0)

Files changed (1)

src/modules/joystick/sdl/wrap_Joystick.cpp

 int w_Joystick_getID(lua_State *L)
 {
 	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)