- fixed joystick support a bit for analog joysticks, menu is still not really useable...

SVN-Revision: 96

diff --git a/src/gameloop.c b/src/gameloop.c
index 3f70658..b9f9596 100644 (file)
--- a/src/gameloop.c
+++ b/src/gameloop.c
@@ -217,20 +217,21 @@ void game_event(void)
         switch(event.jaxis.axis)
            {
            case JOY_X:
-              if (event.jaxis.value < -256)
+             printf("X: %d\n", event.jaxis.value);
+              if (event.jaxis.value < -1024)
                 tux.input.left = DOWN;
-              else
+              else if (event.jaxis.value > 1024)
                 tux.input.left = UP;
 
-              if (event.jaxis.value > 256)
+              if (event.jaxis.value > 1024)
                 tux.input.right = DOWN;
-              else
+              else if (event.jaxis.value < -1024)
                 tux.input.right = UP;
             break;
           case JOY_Y:
-              if (event.jaxis.value > 256)
+              if (event.jaxis.value > 1024)
                 tux.input.down = DOWN;
-              else
+              else if (event.jaxis.value < -1024)
                 tux.input.down = UP;
 
               /* Handle joystick for the menu */

diff --git a/src/title.c b/src/title.c
index 0c66575..a7f5a3e 100644 (file)
--- a/src/title.c
+++ b/src/title.c
@@ -109,11 +109,11 @@ int title(void)
                 }
             }
 #ifdef JOY_YES
-          else if (event.type == SDL_JOYAXISMOTION)
+          else if (event.type == SDL_JOYAXISMOTION && event.jaxis.axis == JOY_Y)
             {
-              if (event.jaxis.value > 256)
+              if (event.jaxis.value > 1024)
                 menuaction = MN_DOWN;
-              else
+              else if (event.jaxis.value < -1024)
                 menuaction = MN_UP;
             }
           else if (event.type == SDL_JOYBUTTONDOWN)