[Super-tux-commit] supertux/src player.cpp,1.121,1.122

[Ryan F. <sik...@us...>]

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

Modified Files:
	player.cpp 
Log Message:
- fixed it so Tux doesn't die on spikes if safety timer is started

Index: player.cpp
===================================================================
RCS file: /cvsroot/super-tux/supertux/src/player.cpp,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -d -r1.121 -r1.122
--- player.cpp	24 May 2004 23:03:43 -0000	1.121
+++ player.cpp	24 May 2004 23:32:41 -0000	1.122
@@ -199,7 +199,7 @@
 
       collision_swept_object_map(&old_base, &base);
 
-      if (!invincible_timer.started()
+      if ((!invincible_timer.started() && !safe_timer.started())
           && (isspike(base.x, base.y) || isspike(base.x + base.width, base.y)
           ||  isspike(base.x, base.y + base.height)
           ||  isspike(base.x + base.width, base.y + base.height)))