super-tux-commit

[Ingo R. <gr...@us...>]

Update of /cvsroot/super-tux/supertux/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9843

Modified Files:
	level.cpp worldmap.cpp 
Log Message:
- cleanup in the worldmap
- fixed duplicate badguy bug

Index: level.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/level.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- level.cpp	25 Mar 2004 12:15:47 -0000	1.18
+++ level.cpp	25 Mar 2004 16:50:13 -0000	1.19
@@ -553,6 +553,8 @@
   plevel->theme.clear();
   plevel->song_title.clear();
   plevel->bkgd_image.clear();
+
+  plevel->badguy_data.clear();
 }
 
 /* Load graphics: */

Index: worldmap.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- worldmap.cpp	25 Mar 2004 16:31:19 -0000	1.16
+++ worldmap.cpp	25 Mar 2004 16:50:13 -0000	1.17
@@ -260,8 +260,8 @@
                       Level level;
                       LispReader reader(lisp_cdr(element));
                       reader.read_string("name",  &level.name);
-                      reader.read_int("x-pos", &level.x);
-                      reader.read_int("y-pos", &level.y);
+                      reader.read_int("x", &level.x);
+                      reader.read_int("y", &level.y);
                       levels.push_back(level);
                     }
                   
@@ -420,9 +420,11 @@
               gameloop(const_cast<char*>((datadir +  "levels/default/" + i->name).c_str()),
                        1, ST_GL_LOAD_LEVEL_FILE);
               play_music(song, 1);
-              break;
+              return;
             }
         }
+      std::cout << "Nothing to enter at: "
+                << tux->get_tile_pos().x << ", " << tux->get_tile_pos().y << std::endl;
     }
   else
     {