- fixed it so Tux doesn't die on spikes if safety timer is started

SVN-Revision: 1319

diff --git a/src/player.cpp b/src/player.cpp
index f11b12a..fde8292 100644 (file)
--- a/src/player.cpp
+++ b/src/player.cpp
@@ -199,7 +199,7 @@ Player::action(float elapsed_time)
 
       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)))