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-04-18 20:31:14 +00:00
parent c61e68d783
commit 91a26f6ed2
2 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
source/player/player.cpp
View file

@ -902,10 +902,17 @@ void CPlayer::takeDamage(DAMAGE_TYPE _damage)
case DAMAGE__NONE: case DAMAGE__NONE:
break; break;
case DAMAGE__ELECTROCUTION:
case DAMAGE__SHOCK_ENEMY:
if(m_squeakyBootsTimer)
{
ouchThatHurt=false;
}
break;
case DAMAGE__FALL: case DAMAGE__FALL:
case DAMAGE__LAVA: case DAMAGE__LAVA:
case DAMAGE__HIT_ENEMY: case DAMAGE__HIT_ENEMY:
case DAMAGE__SHOCK_ENEMY:
case DAMAGE__GAS_ENEMY: case DAMAGE__GAS_ENEMY:
case DAMAGE__POISON_ENEMY: case DAMAGE__POISON_ENEMY:
case DAMAGE__SWALLOW_ENEMY: case DAMAGE__SWALLOW_ENEMY:
@ -914,13 +921,6 @@ void CPlayer::takeDamage(DAMAGE_TYPE _damage)
case DAMAGE__BURN_ENEMY: case DAMAGE__BURN_ENEMY:
case DAMAGE__BITE_ENEMY: case DAMAGE__BITE_ENEMY:
break; break;
case DAMAGE__ELECTROCUTION:
if(m_squeakyBootsTimer)
{
ouchThatHurt=false;
}
break;
} }
if(ouchThatHurt) if(ouchThatHurt)

1
source/player/player.h
View file

@ -268,6 +268,7 @@ public:
void giveGlasses() {m_glassesFlag=true;} void giveGlasses() {m_glassesFlag=true;}
int isWearingGlasses() {return m_glassesFlag;} int isWearingGlasses() {return m_glassesFlag;}
void giveSqueakyBoots() {m_squeakyBootsTimer=SQUEAKY_BOOTS_TIME;} void giveSqueakyBoots() {m_squeakyBootsTimer=SQUEAKY_BOOTS_TIME;}
int isWearingBoots() {return m_squeakyBootsTimer;}
void giveInvinvibilityRing() {m_invinvibilityRingTimer=INVINCIBILITY_RING_TIME;} void giveInvinvibilityRing() {m_invinvibilityRingTimer=INVINCIBILITY_RING_TIME;}
void giveDivingHelmet() {m_divingHelmet=true;} void giveDivingHelmet() {m_divingHelmet=true;}