zydronium/SBSPSS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Paul 2001-09-13 16:02:04 +00:00
parent 1c0d4a983d
commit 17c68037a8
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
source/player/player.cpp
View file

@ -2272,12 +2272,12 @@ int invincibleSponge=false; // NB: This is for debugging purposes only so don't
#endif #endif
void CPlayer::takeDamage(DAMAGE_TYPE _damage,REACT_DIRECTION _reactDirection,CThing *_thing) 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 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_invincibilityRingTimer==0&& // Or if we have the invincibility ring on
m_currentPlayerModeClass->getState()!=STATE_SOAKUP&& // Or soaking up m_currentPlayerModeClass->getState()!=STATE_SOAKUP&& // Or soaking up
m_currentPlayerModeClass->getState()!=STATE_CELEBRATE&& // Or celebrating m_currentPlayerModeClass->getState()!=STATE_CELEBRATE&& // Or celebrating
m_currentMode!=PLAYER_MODE_DEAD && m_currentMode!=PLAYER_MODE_DEAD && // Or already dead! :)
m_currentMode!=PLAYER_MODE_SWALLOW) // Or already dead! :) m_currentMode!=PLAYER_MODE_SWALLOW)
{ {
int ouchThatHurt=true; int ouchThatHurt=true;
int ouchThatHurtSoMuchThatImJustGoingToDieNow=false; int ouchThatHurtSoMuchThatImJustGoingToDieNow=false;