summaryrefslogtreecommitdiff
path: root/src/game.cpp
diff options
context:
space:
mode:
authorEugenio Favalli <elvenprogrammer@gmail.com>2005-09-18 21:32:50 +0000
committerEugenio Favalli <elvenprogrammer@gmail.com>2005-09-18 21:32:50 +0000
commit957cee04cbbb829c0d476b1dfb2a19ee74856c5f (patch)
tree94f7df3abce531cf0df6a099f400da4bc650cb2f /src/game.cpp
parent89dbeaaee05a6ce7adc353f5676df211c1ed83fb (diff)
downloadMana-957cee04cbbb829c0d476b1dfb2a19ee74856c5f.tar.gz
Mana-957cee04cbbb829c0d476b1dfb2a19ee74856c5f.tar.bz2
Mana-957cee04cbbb829c0d476b1dfb2a19ee74856c5f.tar.xz
Mana-957cee04cbbb829c0d476b1dfb2a19ee74856c5f.zip
Increased joypad tolerance which is safer and simplifyed joypad state reset code.
Diffstat (limited to 'src/game.cpp')
-rw-r--r--src/game.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/src/game.cpp b/src/game.cpp
index 95c502c3..7e283bd0 100644
--- a/src/game.cpp
+++ b/src/game.cpp
@@ -429,18 +429,16 @@ void do_input()
Uint8* keys;
keys = SDL_GetKeyState(NULL);
- // Get the state of the joypad buttons
- // TODO: Only 6- buttons joypads are allowed
+ // TODO: Only <= 6 buttons joypads are allowed
bool joy[10];
- for (int i=0; i<10; i++)
- {
- joy[i] = false;
- }
+ memset(joy, 0, 10 * sizeof(bool));
+
+ // Get the state of the joypad axis/buttons
if (joypad != NULL)
{
// TODO: one different value of tolerance is needed for each direction
// This probably means the need for a tuning utility/window
- int tolerance = (int)config.getValue("joytolerance", 10);
+ int tolerance = (int)config.getValue("joytolerance", 100);
SDL_JoystickUpdate();
if (SDL_JoystickGetAxis(joypad, 0) > tolerance)
{