commited Matzes Win32 patch

[supertux.git] / src / intro.cpp

diff --git a/src/intro.cpp b/src/intro.cpp
index a88146d..18f818d 100644 (file)
--- a/src/intro.cpp
+++ b/src/intro.cpp
@@ -18,10 +18,8 @@
 #include <SDL.h>
 #include <SDL_image.h>
 
-#ifndef LINUX
 #include <sys/types.h>
 #include <ctype.h>
-#endif
 
 #include "defines.h"
 #include "globals.h"
@@ -113,14 +111,12 @@ int intro(void)
              
              done = 1;
            }
-#ifdef JOY_YES
          else if (event.type == SDL_JOYBUTTONDOWN)
            {
              /* Fire button - skip intro: */
              
              done = 1;
            }
-#endif
        }