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 c71e11f..b5d0239 100644 (file)
--- 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");