[Super-tux-commit] supertux/src worldmap.cpp,1.97,1.98 worldmap.h,1.37,1.38

[Ricardo C. <rm...@us...>]

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

Modified Files:
	worldmap.cpp worldmap.h 
Log Message:
Just changed the name of a worldmap flag.

Index: worldmap.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v
retrieving revision 1.97
retrieving revision 1.98
diff -u -d -r1.97 -r1.98
--- worldmap.cpp	17 Jul 2004 13:14:20 -0000	1.97
+++ worldmap.cpp	17 Jul 2004 16:20:32 -0000	1.98
@@ -429,7 +429,7 @@
 
                       reader.read_string("extro-filename", level.extro_filename);
                       reader.read_string("map-message", level.display_map_message);
-                      reader.read_string("goto-world", level.goto_worldmap);
+                      reader.read_string("next-world", level.next_worldmap);
                       reader.read_string("level", level.name, true);
                       reader.read_int("x", level.x);
                       reader.read_int("y", level.y);
@@ -788,10 +788,10 @@
           // TODO: add an effect, like a camera scrolling, or at least, a fading
           tux->set_tile_pos(Vector(level->swap_x, level->swap_y));
           }
-        if (!level->goto_worldmap.empty())
+        if (!level->next_worldmap.empty())
           {
           // Load given worldmap
-          loadmap(level->goto_worldmap);
+          loadmap(level->next_worldmap);
           }
         if (level->quit_worldmap)
           quit = true;

Index: worldmap.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/worldmap.h,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- worldmap.h	16 Jul 2004 19:22:26 -0000	1.37
+++ worldmap.h	17 Jul 2004 16:20:33 -0000	1.38
@@ -155,7 +155,7 @@
     std::string display_map_message;
 
     /** Go to this world */
-    std::string goto_worldmap;
+    std::string next_worldmap;
 
     /** Quit the worldmap */
     bool quit_worldmap;