From 9fcc3e3c9a12a8d02d255f6fbcc71639bfd676a0 Mon Sep 17 00:00:00 2001
From: Charles <charles@localhost>
Date: Mon, 22 Jan 2001 14:23:11 +0000
Subject: [PATCH]

---
 makefile.gaz                                  |  2 +-
 source/enemy/npc.cpp                          | 21 +++++++++++++++----
 source/enemy/npc.h                            | 10 ++++-----
 .../spongebob project/spongebob project.dsp   |  4 ++++
 4 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/makefile.gaz b/makefile.gaz
index dfc812d91..fbec74edf 100644
--- a/makefile.gaz
+++ b/makefile.gaz
@@ -57,9 +57,9 @@ enemy_src :=		2denemy \
 					nsjfish \
 					nclam \
 					nscrab \
-					nnsfish \
 					ngpirate \
 					nshrkman \
+					ngeneric \
 					enemy
 
 fileio_src :=		fileio \
diff --git a/source/enemy/npc.cpp b/source/enemy/npc.cpp
index 4992b7811..0cab61c0b 100644
--- a/source/enemy/npc.cpp
+++ b/source/enemy/npc.cpp
@@ -300,7 +300,7 @@ CNpc::NPC_DATA CNpc::m_data[NPC_UNIT_TYPE_MAX] =
 		NPC_SENSOR_NINJA_STARFISH_USER_CLOSE,
 		NPC_MOVEMENT_STATIC,
 		NPC_MOVEMENT_MODIFIER_NONE,
-		NPC_CLOSE_NINJA_STARFISH_ATTACK,
+		NPC_CLOSE_GENERIC_USER_SEEK,
 		NPC_TIMER_NONE,
 		false,
 		3,
@@ -354,12 +354,24 @@ CNpc::NPC_DATA CNpc::m_data[NPC_UNIT_TYPE_MAX] =
 		3,
 		2048,
 	},
+
+	{	// NPC_OIL_BLOB
+		NPC_INIT_DEFAULT,
+		NPC_SENSOR_OIL_BLOB_USER_CLOSE,
+		NPC_MOVEMENT_STATIC,
+		NPC_MOVEMENT_MODIFIER_NONE,
+		NPC_CLOSE_GENERIC_USER_SEEK,
+		NPC_TIMER_NONE,
+		false,
+		3,
+		64,
+	},
 };
 
 
 void CNpc::init()
 {
-	m_type = NPC_SHARK_MAN;
+	m_type = NPC_OIL_BLOB;
 
 	m_heading = 3072;
 	m_movementTimer = 0;
@@ -538,6 +550,7 @@ bool CNpc::processSensor()
 						}
 					}
 
+					case NPC_SENSOR_OIL_BLOB_USER_CLOSE:
 					case NPC_SENSOR_NINJA_STARFISH_USER_CLOSE:
 					{
 						if ( xDistSqr + yDistSqr < 10000 )
@@ -843,8 +856,8 @@ void CNpc::processClose(int _frames)
 
 			break;
 
-		case NPC_CLOSE_NINJA_STARFISH_ATTACK:
-			processCloseNinjaStarfishAttack( _frames );
+		case NPC_CLOSE_GENERIC_USER_SEEK:
+			processCloseGenericUserSeek( _frames );
 
 			break;
 
diff --git a/source/enemy/npc.h b/source/enemy/npc.h
index 0fb59b0be..c501d8c48 100644
--- a/source/enemy/npc.h
+++ b/source/enemy/npc.h
@@ -65,6 +65,7 @@ protected:
 		NPC_GHOST_PIRATE,
 		NPC_FLAMING_SKULL,
 		NPC_SHARK_MAN,
+		NPC_OIL_BLOB,
 		NPC_UNIT_TYPE_MAX,
 	};
 
@@ -92,6 +93,7 @@ protected:
 		NPC_SENSOR_NINJA_STARFISH_USER_CLOSE,
 		NPC_SENSOR_GHOST_PIRATE_USER_CLOSE,
 		NPC_SENSOR_SHARK_MAN_USER_VISIBLE,
+		NPC_SENSOR_OIL_BLOB_USER_CLOSE,
 	};
 
 	enum NPC_CLOSE_FUNC
@@ -100,9 +102,9 @@ protected:
 		NPC_CLOSE_JELLYFISH_EVADE = 1,
 		NPC_CLOSE_CLAM_ATTACK,
 		NPC_CLOSE_SPIDER_CRAB_ATTACK,
-		NPC_CLOSE_NINJA_STARFISH_ATTACK,
 		NPC_CLOSE_GHOST_PIRATE_ATTACK,
 		NPC_CLOSE_SHARK_MAN_ATTACK,
+		NPC_CLOSE_GENERIC_USER_SEEK,
 	};
 
 	enum NPC_MOVEMENT_FUNC
@@ -161,6 +163,8 @@ protected:
 	void				processCollision();
 	void				processTimer( int _frames );
 
+	void				processCloseGenericUserSeek( int _frames );
+
 	// small jellyfish functions
 
 	void				processSmallJellyfishSensor();
@@ -175,10 +179,6 @@ protected:
 
 	void				processCloseSpiderCrabAttack( int _frames );
 
-	// ninja starfish functions
-
-	void				processCloseNinjaStarfishAttack( int _frames );
-
 	// ghost pirate functions
 
 	void				processCloseGhostPirateAttack( int _frames );
diff --git a/users/paul/spongebob project/spongebob project.dsp b/users/paul/spongebob project/spongebob project.dsp
index 194188ded..e90c093bb 100644
--- a/users/paul/spongebob project/spongebob project.dsp	
+++ b/users/paul/spongebob project/spongebob project.dsp	
@@ -129,6 +129,10 @@ SOURCE=..\..\..\source\enemy\nclam.cpp
 # End Source File
 # Begin Source File
 
+SOURCE=..\..\..\source\enemy\ngeneric.cpp
+# End Source File
+# Begin Source File
+
 SOURCE=..\..\..\source\enemy\ngpirate.cpp
 # End Source File
 # Begin Source File