Mirrors/SBSPSS
1
0
Fork 0
Code Releases Activity

Browse Source
This commit is contained in:
Paul 2001-07-13 21:45:29 +00:00
parent 19ef8f78b7
commit eb652f4822
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/player/player.cpp
View File

@ -2029,6 +2029,7 @@ void CPlayer::takeDamage(DAMAGE_TYPE _damage,REACT_DIRECTION _reactDirection,CTh
{ {
int ouchThatHurt=true; int ouchThatHurt=true;
int ouchThatHurtSoMuchThatImJustGoingToDieNow=false; int ouchThatHurtSoMuchThatImJustGoingToDieNow=false;
CSoundMediator::SFXID painSound=CSoundMediator::SFX_SPONGEBOB_OUCH;
// Check if we are currently immune to this damage type // Check if we are currently immune to this damage type
switch(_damage) switch(_damage)
@ -2043,6 +2044,10 @@ void CPlayer::takeDamage(DAMAGE_TYPE _damage,REACT_DIRECTION _reactDirection,CTh
{ {
ouchThatHurt=false; ouchThatHurt=false;
} }
else
{
painSound=CSoundMediator::SFX_BOSS_JELLYFISH___SB_GETS_ELECTROCUTED;
}
break; break;
case DAMAGE__FALL: case DAMAGE__FALL:
@ -2159,6 +2164,7 @@ void CPlayer::takeDamage(DAMAGE_TYPE _damage,REACT_DIRECTION _reactDirection,CTh
case REACT__NO_REACTION: case REACT__NO_REACTION:
break; break;
} }
CSoundMediator::playSfx(painSound);
m_currentPlayerModeClass->setState(STATE_JUMPBACK); m_currentPlayerModeClass->setState(STATE_JUMPBACK);
} }
m_invincibleFrameCount=INVINCIBLE_FRAMES__HIT; m_invincibleFrameCount=INVINCIBLE_FRAMES__HIT;