From: Wolfgang Becker <uafr@gmx.de>
Date: Thu, 6 Jul 2006 11:07:12 +0000 (+0000)
Subject: Tuxdev's patch to fix death by falling when invincible.
X-Git-Url: https://git.verplant.org/?a=commitdiff_plain;h=589c56e01c9ebac8e8bf091f02441d1b99573b84;p=supertux.git

Tuxdev's patch to fix death by falling when invincible.

SVN-Revision: 3913
---

diff --git a/src/object/player.cpp b/src/object/player.cpp
index c71e11fb2..b5d02392c 100644
--- a/src/object/player.cpp
+++ b/src/object/player.cpp
@@ -1012,7 +1012,7 @@ Player::kill(bool completely)
   if(dying || deactivated)
     return;
 
-  if(!completely && safe_timer.started() || invincible_timer.started())
+  if(!completely && (safe_timer.started() || invincible_timer.started()))
     return;                          
   
   sound_manager->play("sounds/hurt.wav");