diff --git a/source/player/player.cpp b/source/player/player.cpp index 913d823ba..e0030b9b8 100644 --- a/source/player/player.cpp +++ b/source/player/player.cpp @@ -902,10 +902,17 @@ void CPlayer::takeDamage(DAMAGE_TYPE _damage) case DAMAGE__NONE: break; + case DAMAGE__ELECTROCUTION: + case DAMAGE__SHOCK_ENEMY: + if(m_squeakyBootsTimer) + { + ouchThatHurt=false; + } + break; + case DAMAGE__FALL: case DAMAGE__LAVA: case DAMAGE__HIT_ENEMY: - case DAMAGE__SHOCK_ENEMY: case DAMAGE__GAS_ENEMY: case DAMAGE__POISON_ENEMY: case DAMAGE__SWALLOW_ENEMY: @@ -914,13 +921,6 @@ void CPlayer::takeDamage(DAMAGE_TYPE _damage) case DAMAGE__BURN_ENEMY: case DAMAGE__BITE_ENEMY: break; - - case DAMAGE__ELECTROCUTION: - if(m_squeakyBootsTimer) - { - ouchThatHurt=false; - } - break; } if(ouchThatHurt) diff --git a/source/player/player.h b/source/player/player.h index 0ba024840..317f1682b 100644 --- a/source/player/player.h +++ b/source/player/player.h @@ -268,6 +268,7 @@ public: void giveGlasses() {m_glassesFlag=true;} int isWearingGlasses() {return m_glassesFlag;} void giveSqueakyBoots() {m_squeakyBootsTimer=SQUEAKY_BOOTS_TIME;} + int isWearingBoots() {return m_squeakyBootsTimer;} void giveInvinvibilityRing() {m_invinvibilityRingTimer=INVINCIBILITY_RING_TIME;} void giveDivingHelmet() {m_divingHelmet=true;}