[Super-tux-commit] supertux/src worldmap.cpp,1.68.2.14,1.68.2.15 worldmap.h,1.28.2.12,1.28.2.13

[Marek M. <wa...@us...>]

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

Modified Files:
      Tag: supertux_0_1_1_branch
	worldmap.cpp worldmap.h 
Log Message:
added support for invisible teleporters
players can now leave a section by going through the igloo


Index: worldmap.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/worldmap.cpp,v
retrieving revision 1.68.2.14
retrieving revision 1.68.2.15
diff -u -d -r1.68.2.14 -r1.68.2.15
--- worldmap.cpp	10 Aug 2004 22:50:39 -0000	1.68.2.14
+++ worldmap.cpp	11 Aug 2004 11:09:42 -0000	1.68.2.15
@@ -474,10 +474,12 @@
                       level.passive_message = true;
                       reader.read_bool("passive-message", &level.passive_message);
 							 
+							 level.invisible_teleporter = false;
 							 level.teleport_dest_x = level.teleport_dest_y = -1;
 							 reader.read_int("dest_x", &level.teleport_dest_x);
 							 reader.read_int("dest_y", &level.teleport_dest_y);
 							 reader.read_string("teleport-message", &level.teleport_message);
+							 reader.read_bool("invisible-teleporter", &level.invisible_teleporter);
                       
 							 level.apply_action_north = level.apply_action_south =
                             level.apply_action_east = level.apply_action_west = true;
@@ -875,7 +877,7 @@
   for(Levels::iterator i = levels.begin(); i != levels.end(); ++i)
     {
       if(i->name.empty()) {
-      	if (i->teleport_dest_x != -1) {
+      	if ((i->teleport_dest_x != -1) && !i->invisible_teleporter) {
 				leveldot_teleporter->draw(i->x*32 + offset.x, 
                              i->y*32 + offset.y);
 			}

Index: worldmap.h
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/worldmap.h,v
retrieving revision 1.28.2.12
retrieving revision 1.28.2.13
diff -u -d -r1.28.2.12 -r1.28.2.13
--- worldmap.h	10 Aug 2004 22:50:39 -0000	1.28.2.12
+++ worldmap.h	11 Aug 2004 11:09:42 -0000	1.28.2.13
@@ -181,6 +181,7 @@
 	 int teleport_dest_x;
 	 int teleport_dest_y;
 	 std::string teleport_message;
+	 bool invisible_teleporter;
 
     /** If false, disables the auto walking after finishing a level */
     bool auto_path;