[Super-tux-commit] supertux/src worldmap.cpp,1.68.2.11,1.68.2.12 worldmap.h,1.28.2.9,1.28.2.10

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

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

Modified Files:
      Tag: supertux_0_1_1_branch
	worldmap.cpp worldmap.h 
Log Message:
Added flag to disable passive messages, so that they become map ones.
(passive-messages #f) . They are enabled by default.
Fixed the "Tilemap buggy message". 

Index: worldmap.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v
retrieving revision 1.68.2.11
retrieving revision 1.68.2.12
diff -u -d -r1.68.2.11 -r1.68.2.12
--- worldmap.cpp	30 Jul 2004 22:34:30 -0000	1.68.2.11
+++ worldmap.cpp	31 Jul 2004 10:39:50 -0000	1.68.2.12
@@ -297,7 +297,8 @@
           offset -= 32;
 
           WorldMap::Level* level = worldmap->at_level();
-          if(level && level->name.empty() && !level->display_map_message.empty())
+          if(level && level->name.empty() && !level->display_map_message.empty() &&
+             level->passive_message)
             {  // direction and the apply_action_ are opposites, since they "see"
                // directions in a different way
             if((direction == D_NORTH && level->apply_action_south) ||
@@ -311,11 +312,7 @@
             }
 
           Tile* cur_tile = worldmap->at(tile_pos);
-          if (cur_tile->stop || (level && !level->name.empty()) ||
-             (cur_tile->one_way == NORTH_SOUTH_WAY && direction != D_SOUTH) ||
-             (cur_tile->one_way == SOUTH_NORTH_WAY && direction != D_NORTH) ||
-             (cur_tile->one_way == EAST_WEST_WAY && direction != D_WEST) ||
-             (cur_tile->one_way == WEST_EAST_WAY && direction != D_EAST))
+          if (cur_tile->stop || (level && !level->name.empty()))
             {
               stop();
             }
@@ -356,7 +353,6 @@
                 }
               else
                 {
-                  puts("Tilemap data is buggy");
                   stop();
                 }
             }
@@ -473,6 +469,8 @@
                       reader.read_string("map-message", &level.display_map_message);
                       level.auto_path = true;
                       reader.read_bool("auto-path", &level.auto_path);
+                      level.passive_message = true;
+                      reader.read_bool("passive-message", &level.passive_message);
 
                       level.apply_action_north = level.apply_action_south =
                             level.apply_action_east = level.apply_action_west = true;
@@ -913,7 +911,7 @@
                 }
 
               /* Display a message in the map, if any as been selected */
-              if((!i->display_map_message.empty() && !i->name.empty()))
+              if(!i->display_map_message.empty() && !i->passive_message)
                 gold_text->draw_align(i->display_map_message.c_str(),
                      screen->w/2, screen->h - 30,A_HMIDDLE, A_BOTTOM);
               break;

Index: worldmap.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/worldmap.h,v
retrieving revision 1.28.2.9
retrieving revision 1.28.2.10
diff -u -d -r1.28.2.9 -r1.28.2.10
--- worldmap.h	30 Jul 2004 22:34:31 -0000	1.28.2.9
+++ worldmap.h	31 Jul 2004 10:39:50 -0000	1.28.2.10
@@ -174,6 +174,7 @@
 
     /** Message to show in the Map during a certain time */
     std::string display_map_message;
+    bool passive_message;
 
     /** If false, disables the auto walking after finishing a level */
     bool auto_path;