bye, bye, joystick ifdefs

SVN-Revision: 302

diff --git a/src/gameloop.cpp b/src/gameloop.cpp
index 8ea2f99..0f383df 100644 (file)
--- a/src/gameloop.cpp
+++ b/src/gameloop.cpp
@@ -231,7 +231,6 @@ void game_event(void)
               break;
             }
           break;
-#ifdef JOY_YES
 
         case SDL_JOYAXISMOTION:
           switch(event.jaxis.axis)
@@ -282,7 +281,6 @@ void game_event(void)
             menuaction = MN_HIT;
           break;
 
-#endif
         default:
           break;
 

diff --git a/src/globals.cpp b/src/globals.cpp
index 2281855..4de3b32 100644 (file)
--- a/src/globals.cpp
+++ b/src/globals.cpp
@@ -26,8 +26,6 @@ bool launch_worldmap_mode = false;
 /* SuperTux directory ($HOME/.supertux) and save directory($HOME/.supertux/save) */
 char *st_dir, *st_save_dir;
 
-#ifdef JOY_YES
 SDL_Joystick * js;
-#endif
 
 

diff --git a/src/globals.h b/src/globals.h
index da08624..0dbd85e 100644 (file)
--- a/src/globals.h
+++ b/src/globals.h
@@ -32,8 +32,6 @@ extern bool launch_worldmap_mode;
 /* SuperTux directory ($HOME/.supertux) and save directory($HOME/.supertux/save) */
 extern char *st_dir, *st_save_dir;
 
-#ifdef JOY_YES
 extern SDL_Joystick * js;
-#endif
 
 #endif /* SUPERTUX_GLOBALS_H */

diff --git a/src/intro.cpp b/src/intro.cpp
index a88146d..2318ec2 100644 (file)
--- a/src/intro.cpp
+++ b/src/intro.cpp
@@ -113,14 +113,12 @@ int intro(void)
              
              done = 1;
            }
-#ifdef JOY_YES
          else if (event.type == SDL_JOYBUTTONDOWN)
            {
              /* Fire button - skip intro: */
              
              done = 1;
            }
-#endif
        }
       
       

diff --git a/src/setup.cpp b/src/setup.cpp
index 6cc2e4a..0210d04 100644 (file)
--- a/src/setup.cpp
+++ b/src/setup.cpp
@@ -661,7 +661,6 @@ void st_joystick_setup(void)
 
   /* Init Joystick: */
 
-#ifdef JOY_YES
   use_joystick = YES;
 
   if (SDL_Init(SDL_INIT_JOYSTICK) < 0)
@@ -675,7 +674,6 @@ void st_joystick_setup(void)
   else
     {
       /* Open joystick: */
-
       if (SDL_NumJoysticks() <= 0)
         {
           fprintf(stderr, "Warning: No joysticks are available.\n");
@@ -719,8 +717,6 @@ void st_joystick_setup(void)
             }
         }
     }
-#endif
-
 }
 
 void st_audio_setup(void)

diff --git a/src/title.cpp b/src/title.cpp
index 3d877a1..2280fbf 100644 (file)
--- a/src/title.cpp
+++ b/src/title.cpp
@@ -124,7 +124,6 @@ int title(void)
                   quit = 1;
                 }
             }
-#ifdef JOY_YES
           else if (event.type == SDL_JOYAXISMOTION && event.jaxis.axis == JOY_Y)
             {
               if (event.jaxis.value > 1024)
@@ -138,8 +137,6 @@ int title(void)
 
               menuaction = MN_HIT;
             }
-#endif
-
         }
 
       /* Draw the background: */