From: Ryan Flegel <rflegel@gmail.com>
Date: Mon, 24 May 2004 23:32:41 +0000 (+0000)
Subject: - fixed it so Tux doesn't die on spikes if safety timer is started
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=9726ad564ae17aaeb1327e76be868826e3080665;p=supertux.git

- 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 f11b12aab..fde829293 100644
--- 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)))