From 8259aac172258db4d4dddf30bf175e13f49db89a Mon Sep 17 00:00:00 2001
From: Charles <charles@localhost>
Date: Fri, 3 Aug 2001 15:22:33 +0000
Subject: [PATCH]

---
 source/enemy/nssnake.cpp | 81 +++++++++++++++++++++-------------------
 1 file changed, 42 insertions(+), 39 deletions(-)

diff --git a/source/enemy/nssnake.cpp b/source/enemy/nssnake.cpp
index 5476f9cb0..a7b809966 100644
--- a/source/enemy/nssnake.cpp
+++ b/source/enemy/nssnake.cpp
@@ -1252,60 +1252,63 @@ void CNpcSeaSnakeEnemy::collidedWith( CThing *_thisThing )
 		{
 			case TYPE_PLAYER:
 			{
-				CPlayer *player = (CPlayer *) _thisThing;
-
-				ATTACK_STATE playerState = player->getAttackState();
-
-				if(playerState==ATTACK_STATE__NONE)
+				if ( m_invulnerableTimer <= 0 )
 				{
-					if ( !player->isRecoveringFromHit() )
+					CPlayer *player = (CPlayer *) _thisThing;
+
+					ATTACK_STATE playerState = player->getAttackState();
+
+					if(playerState==ATTACK_STATE__NONE)
 					{
-						switch( m_data[m_type].detectCollision )
+						if ( !player->isRecoveringFromHit() )
 						{
-							case DETECT_NO_COLLISION:
+							switch( m_data[m_type].detectCollision )
 							{
-								// ignore
-
-								break;
-							}
-
-							case DETECT_ALL_COLLISION:
-							{
-								if ( m_controlFunc != NPC_CONTROL_COLLISION )
+								case DETECT_NO_COLLISION:
 								{
-									m_oldControlFunc = m_controlFunc;
-									m_controlFunc = NPC_CONTROL_COLLISION;
+									// ignore
+
+									break;
 								}
 
-								processUserCollision( _thisThing );
+								case DETECT_ALL_COLLISION:
+								{
+									if ( m_controlFunc != NPC_CONTROL_COLLISION )
+									{
+										m_oldControlFunc = m_controlFunc;
+										m_controlFunc = NPC_CONTROL_COLLISION;
+									}
 
-								break;
-							}
+									processUserCollision( _thisThing );
 
-							case DETECT_ATTACK_COLLISION_GENERIC:
-							{
-								processAttackCollision();
-								processUserCollision( _thisThing );
+									break;
+								}
 
-								break;
+								case DETECT_ATTACK_COLLISION_GENERIC:
+								{
+									processAttackCollision();
+									processUserCollision( _thisThing );
+
+									break;
+								}
 							}
 						}
 					}
-				}
-				else if ( m_invulnerableTimer <= 0 )
-				{
-					// player is attacking, respond appropriately
-
-					if ( m_controlFunc != NPC_CONTROL_SHOT )
+					else
 					{
-						if(playerState==ATTACK_STATE__BUTT_BOUNCE)
-						{
-							player->justButtBouncedABadGuy();
-						}
-						m_controlFunc = NPC_CONTROL_SHOT;
-						m_state = NPC_GENERIC_HIT_CHECK_HEALTH;
+						// player is attacking, respond appropriately
 
-						drawAttackEffect();
+						if ( m_controlFunc != NPC_CONTROL_SHOT )
+						{
+							if(playerState==ATTACK_STATE__BUTT_BOUNCE)
+							{
+								player->justButtBouncedABadGuy();
+							}
+							m_controlFunc = NPC_CONTROL_SHOT;
+							m_state = NPC_GENERIC_HIT_CHECK_HEALTH;
+
+							drawAttackEffect();
+						}
 					}
 				}