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-06-01 20:16:23 +00:00
parent a92e1a17fe
commit 6e6eee5623
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
source/player/player.cpp
View file

@ -1630,7 +1630,7 @@ void CPlayer::playAnimFrameSfx(int _animNo,int _animFrame)
if(m_animFrame==frameSfx->m_frame) if(m_animFrame==frameSfx->m_frame)
{ {
CSoundMediator::SFXID sfxId=frameSfx->m_sfxId; CSoundMediator::SFXID sfxId=frameSfx->m_sfxId;
if(m_squeakyBootsTimer) if(isWearingBoots())
{ {
// Ugh.. horrible way to change the sfx when wearing squeaky boots (pkg) // Ugh.. horrible way to change the sfx when wearing squeaky boots (pkg)
if(sfxId==CSoundMediator::SFX_SPONGEBOB_WALK_1)sfxId=CSoundMediator::SFX_SPONGEBOB_SQUEAKY_SHOES_1; if(sfxId==CSoundMediator::SFX_SPONGEBOB_WALK_1)sfxId=CSoundMediator::SFX_SPONGEBOB_SQUEAKY_SHOES_1;
@ -1903,7 +1903,7 @@ void CPlayer::takeDamage(DAMAGE_TYPE _damage,REACT_DIRECTION _reactDirection,CTh
case DAMAGE__ELECTROCUTION: case DAMAGE__ELECTROCUTION:
case DAMAGE__SHOCK_ENEMY: case DAMAGE__SHOCK_ENEMY:
if(m_squeakyBootsTimer) if(!isWearingBoots())
{ {
ouchThatHurt=false; ouchThatHurt=false;
} }
@ -2410,6 +2410,12 @@ int CPlayer::moveVertical(int _moveDistance)
takeDamage(DAMAGE__COLLISION_DAMAGE); takeDamage(DAMAGE__COLLISION_DAMAGE);
break; break;
case COLLISION_TYPE_FLAG_ELECTRIC:
if(!isWearingBoots())
{
takeDamage(DAMAGE__COLLISION_DAMAGE);
}
break;
default: default:
break; break;
} }