From 17c68037a8b7b2b29df8467cb2cfebaa203ffb6a Mon Sep 17 00:00:00 2001
From: Paul <paul@localhost>
Date: Thu, 13 Sep 2001 16:02:04 +0000
Subject: [PATCH]

---
 source/player/player.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/source/player/player.cpp b/source/player/player.cpp
index 2c6b876c3..f4965d637 100644
--- a/source/player/player.cpp
+++ b/source/player/player.cpp
@@ -2272,12 +2272,12 @@ int invincibleSponge=false;		// NB: This is for debugging purposes only so don't
 #endif
 void CPlayer::takeDamage(DAMAGE_TYPE _damage,REACT_DIRECTION _reactDirection,CThing *_thing)
 {
-	if(m_invincibleFrameCount==0&&								// Don't take damage if still recovering from the last hit
-	   m_invincibilityRingTimer==0&&							// Or if we have the invincibility ring on
-	   m_currentPlayerModeClass->getState()!=STATE_SOAKUP&&		// Or soaking up
-	   m_currentPlayerModeClass->getState()!=STATE_CELEBRATE&&	// Or celebrating
-	   m_currentMode!=PLAYER_MODE_DEAD &&
-	   m_currentMode!=PLAYER_MODE_SWALLOW)							// Or already dead! :)
+	if((m_invincibleFrameCount==0||_damage==DAMAGE__KILL_OUTRIGHT)&&	// Don't take damage if still recovering from the last hit
+	   m_invincibilityRingTimer==0&&									// Or if we have the invincibility ring on
+	   m_currentPlayerModeClass->getState()!=STATE_SOAKUP&&				// Or soaking up
+	   m_currentPlayerModeClass->getState()!=STATE_CELEBRATE&&			// Or celebrating
+	   m_currentMode!=PLAYER_MODE_DEAD &&								// Or already dead! :)
+	   m_currentMode!=PLAYER_MODE_SWALLOW)								
 	{
 		int						ouchThatHurt=true;
 		int						ouchThatHurtSoMuchThatImJustGoingToDieNow=false;