- fixed file extension, removed pwd.h header

SVN-Revision: 298

diff --git a/src/gameloop.cpp b/src/gameloop.cpp
index 8596904..8ea2f99 100644 (file)
--- a/src/gameloop.cpp
+++ b/src/gameloop.cpp
@@ -19,7 +19,6 @@
 #include <SDL.h>
 
 #ifndef WIN32
-#include <pwd.h>
 #include <sys/types.h>
 #include <ctype.h>
 #endif

diff --git a/src/intro.cpp b/src/intro.cpp
index 69aadd9..a88146d 100644 (file)
--- a/src/intro.cpp
+++ b/src/intro.cpp
@@ -19,7 +19,6 @@
 #include <SDL_image.h>
 
 #ifndef LINUX
-#include <pwd.h>
 #include <sys/types.h>
 #include <ctype.h>
 #endif

diff --git a/src/menu.cpp b/src/menu.cpp
index 96ce850..7e91b9d 100644 (file)
--- a/src/menu.cpp
+++ b/src/menu.cpp
@@ -11,7 +11,6 @@
 */
 
 #ifndef WIN32
-#include <pwd.h>
 #include <sys/types.h>
 #include <ctype.h>
 #endif

diff --git a/src/screen.cpp b/src/screen.cpp
index 390e70a..2ac21d0 100644 (file)
--- a/src/screen.cpp
+++ b/src/screen.cpp
@@ -19,7 +19,6 @@
 #include <SDL_image.h>
 
 #ifndef WIN32
-#include <pwd.h>
 #include <sys/types.h>
 #include <ctype.h>
 #endif

diff --git a/src/setup.cpp b/src/setup.cpp
index bc9d10c..4d41e15 100644 (file)
--- a/src/setup.cpp
+++ b/src/setup.cpp
@@ -23,7 +23,6 @@
 #endif
 
 #ifndef WIN32
-#include <pwd.h>
 #include <sys/stat.h>
 #include <sys/types.h>
 #include <dirent.h>

diff --git a/src/title.cpp b/src/title.cpp
index 517c004..3d877a1 100644 (file)
--- a/src/title.cpp
+++ b/src/title.cpp
@@ -19,7 +19,6 @@
 #include <SDL_image.h>
 
 #ifndef WIN32
-#include <pwd.h>
 #include <sys/types.h>
 #include <ctype.h>
 #endif

diff --git a/src/worldmap.cpp b/src/worldmap.cpp
index f71f28e..d7201fb 100644 (file)
--- a/src/worldmap.cpp
+++ b/src/worldmap.cpp
@@ -217,7 +217,7 @@ WorldMap::~WorldMap()
 void
 WorldMap::load_map()
 {
-  lisp_object_t* root_obj = lisp_read_from_file(datadir +  "levels/default/worldmap.scm");
+  lisp_object_t* root_obj = lisp_read_from_file(datadir +  "levels/default/worldmap.stwm");
   assert(root_obj);
   
   if (strcmp(lisp_symbol(lisp_car(root_obj)), "supertux-worldmap") == 0)