- replaced #ifdef LINUX with #ifndef WIN32, should be easier to handle for other...

SVN-Revision: 277

diff --git a/src/gameloop.cpp b/src/gameloop.cpp
index 638219b..05171b1 100644 (file)
--- a/src/gameloop.cpp
+++ b/src/gameloop.cpp
@@ -18,7 +18,7 @@
 #include <time.h>
 #include <SDL.h>
 
-#ifdef LINUX
+#ifndef WIN32
 #include <pwd.h>
 #include <sys/types.h>
 #include <ctype.h>

diff --git a/src/high_scores.cpp b/src/high_scores.cpp
index 741dc62..33836d4 100644 (file)
--- a/src/high_scores.cpp
+++ b/src/high_scores.cpp
@@ -31,15 +31,11 @@ FILE * opendata(char * mode)
   strcpy(filename, st_dir);
   /* Open the high score file: */
 
-#ifdef LINUX
-
+#ifndef WIN32
   strcat(filename, "/highscore");
 #else
-#ifdef WIN32
-
   strcat(filename, "/st_highscore.dat");
 #endif
-#endif
 
 
   /* Try opening the file: */

diff --git a/src/intro.cpp b/src/intro.cpp
index c608d80..451170a 100644 (file)
--- a/src/intro.cpp
+++ b/src/intro.cpp
@@ -18,7 +18,7 @@
 #include <SDL.h>
 #include <SDL_image.h>
 
-#ifdef LINUX
+#ifndef LINUX
 #include <pwd.h>
 #include <sys/types.h>
 #include <ctype.h>

diff --git a/src/menu.cpp b/src/menu.cpp
index edfb205..df4dc7d 100644 (file)
--- a/src/menu.cpp
+++ b/src/menu.cpp
@@ -10,7 +10,7 @@
   December 20, 2003 - March 15, 2004
 */
 
-#ifdef LINUX
+#ifndef WIN32
 #include <pwd.h>
 #include <sys/types.h>
 #include <ctype.h>

diff --git a/src/screen.cpp b/src/screen.cpp
index 40d1e7b..390e70a 100644 (file)
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -18,7 +18,7 @@
 #include <SDL.h>
 #include <SDL_image.h>
 
-#ifdef LINUX
+#ifndef WIN32
 #include <pwd.h>
 #include <sys/types.h>
 #include <ctype.h>

diff --git a/src/setup.cpp b/src/setup.cpp
index 604e408..45fd99b 100644 (file)
--- a/src/setup.cpp
+++ b/src/setup.cpp
@@ -21,7 +21,7 @@
 #include <SDL_opengl.h>
 #endif
 
-#ifdef LINUX
+#ifndef WIN32
 #include <pwd.h>
 #include <sys/stat.h>
 #include <sys/types.h>
@@ -273,22 +273,18 @@ void st_directory_setup(void)
   strcat(st_save_dir,"/save");
 
   /* Create them. In the case they exist they won't destroy anything. */
-#ifdef LINUX
-
+#ifndef WIN32
   mkdir(st_dir, 0755);
   mkdir(st_save_dir, 0755);
 
   sprintf(str, "%s/levels", st_dir);
   mkdir(str, 0755);
 #else
-  #ifdef WIN32
-
   mkdir(st_dir);
   mkdir(st_save_dir);
   sprintf(str, "%s/levels", st_dir);
   mkdir(str);
 #endif
-#endif
 
 }
 

diff --git a/src/title.cpp b/src/title.cpp
index ea74ca8..ba6e6c0 100644 (file)
--- a/src/title.cpp
+++ b/src/title.cpp
@@ -18,7 +18,7 @@
 #include <SDL.h>
 #include <SDL_image.h>
 
-#ifdef LINUX
+#ifndef WIN32
 #include <pwd.h>
 #include <sys/types.h>
 #include <ctype.h>

diff --git a/src/worldmap.cpp b/src/worldmap.cpp
index 4cbd378..2b13276 100644 (file)
--- a/src/worldmap.cpp
+++ b/src/worldmap.cpp
@@ -210,8 +210,7 @@ WorldMap::get_input()
               break;
             case SDLK_LCTRL:
             case SDLK_RETURN:
-              if (!tux_moving)
-                enter_level = true;
+              enter_level = true;
               break;
             default:
               break;
@@ -295,7 +294,7 @@ WorldMap::update()
 {
   float speed = 4.5;
 
-  if (enter_level)
+  if (enter_level && !tux_moving)
     {
       for(Levels::iterator i = levels.begin(); i != levels.end(); ++i)
         {