From 7de1ac5225d99af99846d9cc07407c23a88622a3 Mon Sep 17 00:00:00 2001
From: Charles <charles@localhost>
Date: Tue, 22 May 2001 14:00:18 +0000
Subject: [PATCH]

---
 source/enemy/nbblob.cpp | 28 +++-------------------------
 1 file changed, 3 insertions(+), 25 deletions(-)

diff --git a/source/enemy/nbblob.cpp b/source/enemy/nbblob.cpp
index 849a1f704..2bde67238 100644
--- a/source/enemy/nbblob.cpp
+++ b/source/enemy/nbblob.cpp
@@ -47,20 +47,12 @@ void CNpcBallBlobEnemy::processMovement( int _frames )
 	s32 waypointHeading;
 	s32 groundHeight;
 
-	if ( !m_animPlaying && m_frame != 0 )
+	if ( !m_animPlaying )
 	{
+		m_animPlaying = true;
 		m_animNo = ANIM_BALLBLOB_IDLE;
 		m_frame = 0;
 	}
-	else if ( m_animNo == ANIM_BALLBLOB_IDLE )
-	{
-		moveX = 0;
-		moveY = 0;
-
-		processMovementModifier( _frames, moveX, moveY, moveVel, moveDist );
-
-		return;
-	}
 
 	// deal with vertical
 
@@ -84,16 +76,10 @@ void CNpcBallBlobEnemy::processMovement( int _frames )
 		if ( m_velocity.vy > 0 )
 		{
 			m_velocity.vy = -m_velocity.vy;
-			m_animPlaying = true;
-			m_animNo = ANIM_BALLBLOB_IDLE;
-			m_frame = 0;
 		}
 		else
 		{
 			m_velocity.vy = -( 5 << 8 );
-			m_animPlaying = true;
-			m_animNo = ANIM_BALLBLOB_IDLE;
-			m_frame = 0;
 		}
 
 		moveY = groundHeight;
@@ -103,15 +89,7 @@ void CNpcBallBlobEnemy::processMovement( int _frames )
 
 	bool pathComplete;
 	
-	if ( m_npcPath.thinkFlat( Pos, &pathComplete, &waypointXDist, &waypointYDist, &waypointHeading ) )
-	{
-		if ( m_animNo != ANIM_BALLBLOB_IDLE)
-		{
-			m_animPlaying = true;
-			m_animNo = ANIM_BALLBLOB_IDLE;
-			m_frame = 0;
-		}
-	}
+	m_npcPath.thinkFlat( Pos, &pathComplete, &waypointXDist, &waypointYDist, &waypointHeading );
 
 	if ( waypointHeading == 0 )
 	{