- replaced YES/NO with true/false

[supertux.git] / src / intro.cpp

diff --git a/src/intro.cpp b/src/intro.cpp
index 69aadd9..0edd17a 100644 (file)
--- a/src/intro.cpp
+++ b/src/intro.cpp
@@ -18,11 +18,8 @@
 #include <SDL.h>
 #include <SDL_image.h>
 
-#ifndef LINUX
-#include <pwd.h>
 #include <sys/types.h>
 #include <ctype.h>
-#endif
 
 #include "defines.h"
 #include "globals.h"
@@ -92,7 +89,7 @@ int intro(void)
   scene = 0;
   i = 0;
   
-  timer_init(&timer,NO);
+  timer_init(&timer, false);
   timer_start(&timer,10000);
   
   while (timer_check(&timer) && !done && !quit)
@@ -114,14 +111,12 @@ int intro(void)
              
              done = 1;
            }
-#ifdef JOY_YES
          else if (event.type == SDL_JOYBUTTONDOWN)
            {
              /* Fire button - skip intro: */
              
              done = 1;
            }
-#endif
        }