Utils/MkActor/MkActor.cpp

@@ -652,6 +652,7 @@ vector<sSpriteAnim>	Hdrs;
 				OutFrame.FrameIdx=ThisFrame.FrameIdx;
 				OutFrame.XOfs=ThisFrame.XOfs;
 				OutFrame.YOfs=ThisFrame.YOfs;
+
 				fwrite(&OutFrame,1,sizeof(sSpriteFrame),File);
 			}
 			PadFile(File);

data/DataCache.scr

@@ -199,6 +199,7 @@ actors/GARY.SBK
 actors/SANDY.SBK
 actors/PATRICK.SBK
 actors/MERMAIDMAN.SBK
+actors/PLANKTON.SBK
 
 actors/ANENOME.SBK
 actors/BABYOCTOPUS.SBK

makefile.gaz

@@ -97,8 +97,7 @@ friend_src :=		friend \
 					fsquid \
 					fsandy \
 					fkrusty \
-					fpatrick \
-					fplnkton
+					fpatrick
 
 platform_src :=		platform \
 					platdata \

makefile.gfx

@@ -114,11 +114,11 @@ ACTOR_NPC :=			BarnacleBoy Krusty Squidward Gary Sandy Patrick MermaidMan
 ACTOR_ENEMY :=			Anenome BabyOctopus Ballblob Caterpillar clam Dustdevil \
 						Flamingskull FlyingDutchman Ghost HermitCrab IronDogFish \
 						PuffaFish Manray Skeletalfish SpiderCrab SpikeyAnenome Stomper \
-						SharkSub Motherjellyfish SeaSnake GiantWorm
+						SharkSub Motherjellyfish SeaSnake GiantWorm Plankton
 
 #						Boogermonster Nautilus Neptune 
 
-ACTOR_SPRITES :=		Jellyfish1 Squiddart Plankton Butterfly Shell Eyeball
+ACTOR_SPRITES :=		Jellyfish1 Squiddart Butterfly Shell Eyeball
 
 ACTOR_SPR_LIST :=		$(foreach ACTOR,$(ACTOR_SPRITES), $(ACTOR_IN_DIR)/$(ACTOR)/$(ACTOR_SPRITE_DIR)/$(ACTOR)_*.bmp)
 ACTOR_SPR_DEP :=		$(foreach ACTOR,$(ACTOR_SPRITES), $(ACTOR_IN_DIR)/$(ACTOR)/$(ACTOR_SPRITE_DIR)/*)

source/friend/fdata.cpp

@@ -34,7 +34,7 @@
 #ifndef	__ANIM_PATRICK_HEADER__
 #include <ACTOR_PATRICK_Anim.h>
 #endif
-
+/*
 #ifndef	__ANIM_BARNACLEBOY_HEADER__
 #include <ACTOR_BARNACLEBOY_Anim.h>
 #endif
@@ -42,7 +42,7 @@
 #ifndef	__ANIM_MERMAIDMAN_HEADER__
 #include <ACTOR_MERMAIDMAN_Anim.h>
 #endif
-
+*/
 #ifndef __ANIM_GARY_HEADER__
 #include <ACTOR_GARY_Anim.h>
 #endif
@@ -56,7 +56,7 @@ CNpcFriend::NPC_FRIEND_DATA CNpcFriend::m_data[NPC_FRIEND_UNIT_TYPE_MAX] =
 		128,
 		false,
 		DAMAGE__HIT_ENEMY,
-		ANIM_BARNACLEBOY_IDLE,
+		0,//ANIM_BARNACLEBOY_IDLE,
 	},
 
 	{	// NPC_FRIEND_GARY
@@ -83,7 +83,7 @@ CNpcFriend::NPC_FRIEND_DATA CNpcFriend::m_data[NPC_FRIEND_UNIT_TYPE_MAX] =
 		128,
 		false,
 		DAMAGE__HIT_ENEMY,
-		ANIM_MERMAIDMAN_IDLE,
+		0,//ANIM_MERMAIDMAN_IDLE,
 	},
 
 	{	// NPC_FRIEND_PATRICK

source/friend/friend.cpp

@@ -26,11 +26,11 @@
 #ifndef	__UTILS_HEADER__
 #include	"utils\utils.h"
 #endif
-
+/*
 #ifndef __FRIEND_FBBOY_H__
 #include "friend\fbboy.h"
 #endif
-
+*/
 #ifndef __FRIEND_FGARY_H__
 #include "friend\fgary.h"
 #endif
@@ -38,11 +38,11 @@
 #ifndef __FRIEND_FKRUSTY_H__
 #include "friend\fkrusty.h"
 #endif
-
+/*
 #ifndef __FRIEND_FMMAN_H__
 #include "friend\fmman.h"
 #endif
-
+*/
 #ifndef __FRIEND_FPATRICK_H__
 #include "friend\fpatrick.h"
 #endif
@@ -96,7 +96,8 @@ CNpcFriend	*CNpcFriend::Create(sThingActor *ThisActor)
 	{
 		case CNpcFriend::NPC_FRIEND_BARNACLE_BOY:
 		{
-			friendNpc = new ("barnacle boy") CNpcBarnacleBoyFriend;
+			ASSERT(!"Friend removed");
+//			friendNpc = new ("barnacle boy") CNpcBarnacleBoyFriend;
 			break;
 		}
 
@@ -114,7 +115,8 @@ CNpcFriend	*CNpcFriend::Create(sThingActor *ThisActor)
 
 		case CNpcFriend::NPC_FRIEND_MERMAID_MAN:
 		{
-			friendNpc = new ("mermaid man") CNpcMermaidManFriend;
+			ASSERT(!"Friend removed");
+//			friendNpc = new ("mermaid man") CNpcMermaidManFriend;
 			break;
 		}
 
@@ -138,7 +140,8 @@ CNpcFriend	*CNpcFriend::Create(sThingActor *ThisActor)
 
 		case CNpcFriend::NPC_FRIEND_PLANKTON:
 		{
-			friendNpc = new ("plankton") CNpcPlanktonFriend;
+			ASSERT(!"Friend removed");
+//			friendNpc = new ("plankton") CNpcPlanktonFriend;
 			break;
 		}