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

Merge in minor branch, now minor is our next development target

Browse Source
This commit is contained in:
Bart van Strien
2011-05-07 14:12:41 +02:00
parent f136347bca a18632ce2d
commit 4fd9888a16
70 changed files with 3883 additions and 3571 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/joystick/sdl/wrap_Joystick.cpp
+14 -14
View File
@@ -36,57 +36,57 @@ namespace sdl
int w_getName(lua_State * L)
{
int index = luaL_checkint(L, 1);
int index = luaL_checkint(L, 1)-1;
lua_pushstring(L, instance->getName(index));
return 1;
}
int w_open(lua_State * L)
{
int index = luaL_checkint(L, 1);
int index = luaL_checkint(L, 1)-1;
luax_pushboolean(L, instance->open(index));
return 1;
}
int w_isOpen(lua_State * L)
{
int index = luaL_checkint(L, 1);
int index = luaL_checkint(L, 1)-1;
luax_pushboolean(L, instance->isOpen(index));
return 1;
}
int w_getNumAxes(lua_State * L)
{
int index = luaL_checkint(L, 1);
int index = luaL_checkint(L, 1)-1;
lua_pushinteger(L, instance->getNumAxes(index));
return 1;
}
int w_getNumBalls(lua_State * L)
{
int index = luaL_checkint(L, 1);
int index = luaL_checkint(L, 1)-1;
lua_pushinteger(L, instance->getNumBalls(index));
return 1;
}
int w_getNumButtons(lua_State * L)
{
int index = luaL_checkint(L, 1);
int index = luaL_checkint(L, 1)-1;
lua_pushinteger(L, instance->getNumButtons(index));
return 1;
}
int w_getNumHats(lua_State * L)
{
int index = luaL_checkint(L, 1);
int index = luaL_checkint(L, 1)-1;
lua_pushinteger(L, instance->getNumHats(index));
return 1;
}
int w_getAxis(lua_State * L)
{
int index = luaL_checkint(L, 1);
int axis = luaL_checkint(L, 2);
int index = luaL_checkint(L, 1)-1;
int axis = luaL_checkint(L, 2)-1;
lua_pushnumber(L, instance->getAxis(index, axis));
return 1;
}
@@ -103,14 +103,14 @@ namespace sdl
int w_isDown(lua_State * L)
{
int index = luaL_checkint(L, 1);
int index = luaL_checkint(L, 1)-1;
unsigned int num = lua_gettop(L);
int * buttonlist = new int[num];
unsigned int counter = 0;
for (unsigned int i = 1; i < num; i++)
{
buttonlist[counter++] = (int) luaL_checknumber(L, i+1);
buttonlist[counter++] = (int) luaL_checknumber(L, i+1)-1;
}
buttonlist[counter] = -1;
@@ -121,8 +121,8 @@ namespace sdl
int w_getHat(lua_State * L)
{
int index = luaL_checkint(L, 1);
int hat = luaL_checkint(L, 2);
int index = luaL_checkint(L, 1)-1;
int hat = luaL_checkint(L, 2)-1;
Joystick::Hat h = instance->getHat(index, hat);
@@ -135,7 +135,7 @@ namespace sdl
int w_close(lua_State * L)
{
int index = luaL_checkint(L, 1);
int index = luaL_checkint(L, 1)-1;
instance->close(index);
return 0;
}