From 6e6eee56239a8dc89642cf1a8d578f3dd2162b2f Mon Sep 17 00:00:00 2001
From: Paul <paul@localhost>
Date: Fri, 1 Jun 2001 20:16:23 +0000
Subject: [PATCH]

---
 source/player/player.cpp | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/source/player/player.cpp b/source/player/player.cpp
index 7768598a2..60cdbf383 100644
--- a/source/player/player.cpp
+++ b/source/player/player.cpp
@@ -1630,7 +1630,7 @@ void CPlayer::playAnimFrameSfx(int _animNo,int _animFrame)
 			if(m_animFrame==frameSfx->m_frame)
 			{
 				CSoundMediator::SFXID sfxId=frameSfx->m_sfxId;
-				if(m_squeakyBootsTimer)
+				if(isWearingBoots())
 				{
 					// 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;
@@ -1903,7 +1903,7 @@ void CPlayer::takeDamage(DAMAGE_TYPE _damage,REACT_DIRECTION _reactDirection,CTh
 
 			case DAMAGE__ELECTROCUTION:
 			case DAMAGE__SHOCK_ENEMY:
-				if(m_squeakyBootsTimer)
+				if(!isWearingBoots())
 				{
 					ouchThatHurt=false;
 				}
@@ -2410,6 +2410,12 @@ int		CPlayer::moveVertical(int _moveDistance)
 				takeDamage(DAMAGE__COLLISION_DAMAGE);
 				break;
 
+			case COLLISION_TYPE_FLAG_ELECTRIC:
+				if(!isWearingBoots())
+				{
+					takeDamage(DAMAGE__COLLISION_DAMAGE);
+				}
+				break;
 			default:
 				break;
 		}