diff --git a/src/modules/joystick/sdl/Joystick.cpp b/src/modules/joystick/sdl/Joystick.cpp index c5446903a..1926b4238 100644 --- a/src/modules/joystick/sdl/Joystick.cpp +++ b/src/modules/joystick/sdl/Joystick.cpp @@ -146,11 +146,6 @@ int Joystick::getAxisCount(int index) return verifyJoystick(index) ? SDL_JoystickNumAxes(joysticks[index]) : 0; } -int Joystick::getBallCount(int index) -{ - return verifyJoystick(index) ? SDL_JoystickNumBalls(joysticks[index]) : 0; -} - int Joystick::getButtonCount(int index) { return verifyJoystick(index) ? SDL_JoystickNumButtons(joysticks[index]) : 0; @@ -194,25 +189,6 @@ int Joystick::getAxes(lua_State *L) return num; } -int Joystick::getBall(lua_State *L) -{ - int index = luaL_checkint(L, 1) - 1; - int ball = luaL_checkint(L, 2) - 1; - - if (!verifyJoystick(index)) - return 0; - - if (ball >= getBallCount(index)) - return 0; - - int dx, dy; - SDL_JoystickGetBall(joysticks[index], ball, &dx, &dy); - - lua_pushnumber(L, dx); - lua_pushnumber(L, dy); - return 2; -} - bool Joystick::isDown(int index, int *buttonlist) { if (!verifyJoystick(index)) diff --git a/src/modules/joystick/sdl/Joystick.h b/src/modules/joystick/sdl/Joystick.h index ef64ca6c6..599920384 100644 --- a/src/modules/joystick/sdl/Joystick.h +++ b/src/modules/joystick/sdl/Joystick.h @@ -54,13 +54,11 @@ public: bool isOpen(int index); bool verifyJoystick(int index); int getAxisCount(int index); - int getBallCount(int index); int getButtonCount(int index); int getHatCount(int index); float clampval(float x); float getAxis(int index, int axis); int getAxes(lua_State *L); - int getBall(lua_State *L); bool isDown(int index, int *buttonlist); Hat getHat(int index, int hat); void close(int index); diff --git a/src/modules/joystick/sdl/wrap_Joystick.cpp b/src/modules/joystick/sdl/wrap_Joystick.cpp index d0a6935e6..1545e6624 100644 --- a/src/modules/joystick/sdl/wrap_Joystick.cpp +++ b/src/modules/joystick/sdl/wrap_Joystick.cpp @@ -62,13 +62,6 @@ int w_getAxisCount(lua_State *L) return 1; } -int w_getBallCount(lua_State *L) -{ - int index = luaL_checkint(L, 1) - 1; - lua_pushinteger(L, instance->getBallCount(index)); - return 1; -} - int w_getButtonCount(lua_State *L) { int index = luaL_checkint(L, 1) - 1; @@ -96,11 +89,6 @@ int w_getAxes(lua_State *L) return instance->getAxes(L); } -int w_getBall(lua_State *L) -{ - return instance->getBall(L); -} - int w_isDown(lua_State *L) { int index = luaL_checkint(L, 1) - 1; @@ -140,14 +128,10 @@ static const luaL_Reg functions[] = { "getJoystickCount", w_getJoystickCount }, { "getName", w_getName }, { "getAxisCount", w_getAxisCount }, - { "getBallCount", w_getBallCount }, { "getButtonCount", w_getButtonCount }, { "getHatCount", w_getHatCount }, { "getAxis", w_getAxis }, - { "getAxes", w_getAxes }, - { "getBall", w_getBall }, - { "isDown", w_isDown }, { "getHat", w_getHat }, { 0, 0 } diff --git a/src/modules/joystick/sdl/wrap_Joystick.h b/src/modules/joystick/sdl/wrap_Joystick.h index ed3db62a7..6b7fb962d 100644 --- a/src/modules/joystick/sdl/wrap_Joystick.h +++ b/src/modules/joystick/sdl/wrap_Joystick.h @@ -36,12 +36,10 @@ int w_reload(lua_State *L); int w_getJoystickCount(lua_State *L); int w_getName(lua_State *L); int w_getAxisCount(lua_State *L); -int w_getBallCount(lua_State *L); int w_getButtonCount(lua_State *L); int w_getHatCount(lua_State *L); int w_getAxis(lua_State *L); int w_getAxes(lua_State *L); -int w_getBall(lua_State *L); int w_isDown(lua_State *L); int w_getHat(lua_State *L); extern "C" LOVE_EXPORT int luaopen_love_joystick(lua_State *L);