source/enemy/nmjback.cpp

@@ -33,9 +33,9 @@ void CNpcMotherJellyfishBackground::postInit()
 {
 	CNpcEnemy::postInit();
 
-	CFXJellyFishLegs	*T=(CFXJellyFishLegs*)CFX::Create(CFX::FX_TYPE_JELLYFISH_LEGS,this);
+//	CFXJellyFishLegs	*T=(CFXJellyFishLegs*)CFX::Create(CFX::FX_TYPE_JELLYFISH_LEGS,this);
-	T->SetUp(128,4,8,16);
+//	T->SetUp(128,4,8,16);
-	T->SetOtPos( 15 );
+//	T->SetOtPos( 15 );
 
 	m_actorGfx->SetOtPos( 15 );
 }

source/enemy/nmjfish.cpp

@@ -56,8 +56,8 @@ void CNpcMotherJellyfishEnemy::postInit()
 		m_health = CLevel::getBossHealth();
 	}
 
-	CFXJellyFishLegs	*T=(CFXJellyFishLegs*)CFX::Create(CFX::FX_TYPE_JELLYFISH_LEGS,this);
+//	CFXJellyFishLegs	*T=(CFXJellyFishLegs*)CFX::Create(CFX::FX_TYPE_JELLYFISH_LEGS,this);
-	T->SetUp(128,4,8,16);
+//	T->SetUp(128,4,8,16);
 }
 
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////

source/gfx/actor.cpp

@@ -63,7 +63,6 @@ int		SlotW=+32000,SlotH=+32000;
 
 // Find best slot which fits in
 	
-//		ASSERT(!"ReAlloc");
 		for (i=0;i<SlotCount; i++)
 		{
 			int	ThisW=(SlotList[i].Width-W);
@@ -125,52 +124,69 @@ int		Slot=0;
 }
 
 /*****************************************************************************/
-sPoolNode *CActorCache::RemoveHeadNode(sNodeList *Root)
+sPoolNode *CActorCache::RemoveHeadNode(sNodeList *RootNode)
 {
-sPoolNode *Node=Root->Head;
+sPoolNode *ThisNode=RootNode->Head;
-sPoolNode *Next=Node->Next;
+sPoolNode *NextNode=ThisNode->Next;
 
-		Root->Head=Node->Next;
+		RootNode->Head=NextNode;
-		Next->Prev=0;
+		ThisNode->Next=0;
-		Node->Next=0;
+		if (NextNode)
-		return(Node);
+		{
+			NextNode->Prev=0;
+		}
+		else
+		{ // Its Tail Node
+			RootNode->Tail=0;
+		}
+		return(ThisNode);
 }
 
 /*****************************************************************************/
-void	CActorCache::RemoveNode(sPoolNode *Node,sNodeList *Root)
+void	CActorCache::RemoveNode(sPoolNode *ThisNode,sNodeList *RootNode)
 {
-sPoolNode	*Prev=Node->Prev;
+sPoolNode	*PrevNode=ThisNode->Prev;
-sPoolNode	*Next=Node->Next;
+sPoolNode	*NextNode=ThisNode->Next;
 
-		if (Prev)
+		if (PrevNode)
 		{ // Not Head Node
-			Prev->Next=Node->Next;
+			PrevNode->Next=NextNode;
 		}
-		if (Next)
+		else
+		{ // Head Node
+			RootNode->Head=NextNode;
+		}
+
+		if (NextNode)
 		{ // Not Tail Node
-			Next->Prev=Node->Prev;
+			NextNode->Prev=PrevNode;
 		}
+		else
+		{ // Tail Node
+			RootNode->Tail=PrevNode;
+		}
+		ThisNode->Next=0;
+		ThisNode->Prev=0;
 }
 
 /*****************************************************************************/
 // Add node to end of list
-void	CActorCache::AddNode(sPoolNode *Node,sNodeList *Root)
+void	CActorCache::AddNode(sPoolNode *ThisNode,sNodeList *RootNode)
 {
-sPoolNode	*Prev=Root->Tail;
+sPoolNode	*TailNode=RootNode->Tail;
-sPoolNode	*Next=0;
 
-		if (Prev)
+		if (TailNode)
-		{ // Not Head Node
+		{
-			Prev->Next=Node;
+			TailNode->Next=ThisNode;
 		}
 		else
-		{
+		{ // List is empty 
-			Root->Head=Node;
+			RootNode->Head=ThisNode;
 		}
-
+		ThisNode->Prev=TailNode;
-		Node->Prev=Prev;
+		ThisNode->Next=0;
-		Node->Next=0;
+		ASSERT(ThisNode);
-		Root->Tail=Node;
+		RootNode->Tail=ThisNode;
 }
 
 /*****************************************************************************/
@@ -181,24 +197,30 @@ sPoolNode	*SrcHead=Src->Head;
 sPoolNode	*SrcTail=Src->Tail;
 sPoolNode	*DstHead=Dst->Head;
 sPoolNode	*DstTail=Dst->Tail;
-
+/*
 		if (!SrcHead) return;
 
-		if (!DstTail)
+		if (DstTail)
-		{
-			Dst->Head=SrcHead;
-			SrcHead->Prev=0;
-		}
-		else
 		{
 			DstTail->Next=SrcHead;
-			SrcHead->Prev=DstTail;
+		}
+		else
+		{ // List is empty 
+			Dst->Head=SrcHead;
 		}
 
-		SrcTail->Next=0;
+		SrcHead->Prev=DstTail;
 		Dst->Tail=SrcTail;
 		Src->Head=0;
 		Src->Tail=0;
+*/
+		while(SrcHead)
+		{
+			sPoolNode	*Next=SrcHead->Next;
+			AddNode(SrcHead,Dst);
+			SrcHead=Next;
+		}
+
 }
 
 /*****************************************************************************/
@@ -216,7 +238,7 @@ int		TPW=CACHE_W/SlotCount;
 int		MaxW=0;
 int		MaxH=0;
 
-/*		if (TPW<1) */TPW=1;
+		TPW=1;
 
 		ASSERT(SlotCount<=CACHE_W);
 
@@ -241,6 +263,7 @@ sPoolNode	*List;
 
 // Init List
 			
+			ThisSlot->SlotCount=Total;
 			ThisSlot->ListMem=(u8*)MemAlloc(Total*sizeof(sPoolNode),"CacheNodeList");
 			List=(sPoolNode*)ThisSlot->ListMem;
 
@@ -254,7 +277,7 @@ sPoolNode	*List;
 					int	TexX=CACHE_X+CurrentTPX+(U>>2);
 					int	TexY=CACHE_Y+V;
 
-					List->Actor=0;
+					List->Actor=(FileEquate)0;
 					List->TexX=TexX;
 					List->TexY=TexY;
 					List->U=U&255;
@@ -367,9 +390,11 @@ sActorPool	*List=ActorList;
 
 			while (List)
 			{
-				List->PoolCache=Cache.GetSlotList(List->CacheSlot);
+				List->GlobalCache=Cache.GetSlotList(List->CacheSlot);
-				List->ActorCache.Head=0;
+				List->LocalCache.Head=0;
-				List->ActorCache.Tail=0;
+				List->LocalCache.Tail=0;
+				List->LastCache.Head=0;
+				List->LastCache.Tail=0;
 				List=List->Next;
 			}
 }
@@ -469,6 +494,18 @@ void		CActorPool::AddActor(sActorPool *NewActor)
 			Cache.LoadPalette(NewActor);
 			LastActor=NewActor;
 }
+
+int		CountSlots(sPoolNode *Node)
+{
+int		Count=0;
+			while (Node)
+			{
+				Count++;
+				Node=Node->Next;
+			}
+	return(Count);
+
+}
 /*****************************************************************************/
 void	CActorPool::CleanUpCache()
 {
@@ -476,10 +513,26 @@ sActorPool	*Actor=ActorList;
 			
 		while (Actor) 
 		{
-				CActorCache::AddNodeList(&Actor->ActorCache ,Actor->PoolCache);
+//			Actor->LastCache.Head=0;//Actor->LocalCache.Head;
+//			Actor->LastCache.Tail=0;//Actor->LocalCache.Tail;
+			CActorCache::AddNodeList(&Actor->LocalCache ,Actor->GlobalCache);
+			Actor->LocalCache.Head=0;
+			Actor->LocalCache.Tail=0;
+//			ASSERT(Actor->GlobalCache->Head);
+//			ASSERT(Actor->GlobalCache->Tail);
 			Actor=Actor->Next;
 		}
+/*
+		for (int i=0;i<CActorPool::Cache.GetSlotCount(); i++)
+		{
 
+			sPoolSlot	&Slot=CActorPool::Cache.GetSlot(i);
+			int			Count=CountSlots(Slot.NodeList.Head);
+
+			printf("SC %i: %i %i\n",i,Slot.SlotCount,Count);
+			ASSERT(Slot.SlotCount==Count);
+		}
+*/
 }
 
 /*****************************************************************************/
@@ -514,55 +567,70 @@ u16				ThisFrame=ThisAnim->Anim[Frame];
 }
 
 /*****************************************************************************/
+sActorPool		*DbgPool;
 POLY_FT4	*CActorGfx::Render(DVECTOR &Pos,int Anim,int Frame,bool XFlip,bool YFlip)
 {
-
+sPoolNode		*ThisNode,*FindNode;
-sPoolNode		*ThisNode;;
 POLY_FT4		*Ft4;
 
+			DbgPool=PoolEntry;
 			CurrentFrame=GetFrame(Anim,Frame);
-// Is cached?
+			ThisNode=0;
-			ThisNode=PoolEntry->ActorCache.Head;
+
-			while (ThisNode)
+// Check Local Cache
+			FindNode=PoolEntry->LocalCache.Head;
+			while (FindNode)
 			{ // Try local Cache (From Head forward)
-				if (ThisNode->Actor==PoolEntry->Filename && ThisNode->Anim==Anim && ThisNode->Frame==Frame) break;
+				if (FindNode->Actor==PoolEntry->Filename && FindNode->Anim==Anim && FindNode->Frame==Frame) 
-				ThisNode=ThisNode->Next;
+				{
+					ThisNode=FindNode;
+					break;
 				}
-/*			
+				FindNode=FindNode->Next;
+			}
+
+// Check Last Cache
 			if (!ThisNode)
-			{ // Try main cache ( from tail back)
-			
-				ThisNode=PoolEntry->PoolCache->Tail;
-				while (ThisNode)
 			{
-					if (ThisNode->Actor==PoolEntry->Filename && ThisNode->Anim==Anim && ThisNode->Frame==Frame) break;
+				FindNode=PoolEntry->LastCache.Head;
-					if (ThisNode->Prev==PoolEntry->PoolCache->Tail) ThisNode->Prev=0;
+				while (FindNode)
-					ThisNode=ThisNode->Prev;
+				{
+					if (FindNode->Actor==PoolEntry->Filename && FindNode->Anim==Anim && FindNode->Frame==Frame) 
+					{
+						ThisNode=FindNode;
+						CActorCache::RemoveNode(ThisNode,PoolEntry->GlobalCache);
+						CActorCache::AddNode(ThisNode,&PoolEntry->LocalCache);
+						break;
+					}
+					if (FindNode==PoolEntry->LastCache.Tail) break;
+					FindNode=FindNode->Next;
+				}
 
 			}
-				if (ThisNode)
+			
+// Check Global Cache
+			if (!ThisNode)
 			{
-					CActorCache::RemoveNode(ThisNode,PoolEntry->PoolCache);
+				FindNode=PoolEntry->GlobalCache->Tail;
-					CActorCache::AddNode(ThisNode,&PoolEntry->ActorCache);
+				while (FindNode)
-				}
-			}
-			else
 				{
+					if (FindNode->Actor==PoolEntry->Filename && FindNode->Anim==Anim && FindNode->Frame==Frame)
+					{
+						ThisNode=FindNode;
+						CActorCache::RemoveNode(ThisNode,PoolEntry->GlobalCache);
+						CActorCache::AddNode(ThisNode,&PoolEntry->LocalCache);
+						break;
 					}
-*/
+					FindNode=FindNode->Prev;
+				}
+			}
+
+// Could not find it, get new
 			if (!ThisNode)
 			{ // Not cached frame
-				ThisNode=CActorCache::RemoveHeadNode(PoolEntry->PoolCache);
+				ThisNode=CActorCache::RemoveHeadNode(PoolEntry->GlobalCache);
-				if (ThisNode)
-				{
-					CActorCache::AddNode(ThisNode,&PoolEntry->ActorCache);
-				}
-				else
-				{
-//					printf("NO FREE NODES\n");
-					ThisNode=PoolEntry->ActorCache.Head;
-				}
 				ASSERT(ThisNode);
+				CActorCache::AddNode(ThisNode,&PoolEntry->LocalCache);
 				RECT	R;
 
 				ThisNode->Actor=PoolEntry->Filename;

source/gfx/actor.h

@@ -16,7 +16,7 @@
 // Pack together Actor anim & frame for quicker check later
 struct	sPoolNode
 {
-		u16			Actor;
+		FileEquate	Actor;
 		u16			Anim;
 		u16			Frame;
 		u16			TPage;
@@ -38,6 +38,7 @@ struct	sPoolSlot
 		u16			FrameCount;
 		sNodeList	NodeList;
 		u8			*ListMem;
+		int			SlotCount;
 };
 
 /*****************************************************************************/
@@ -46,8 +47,9 @@ struct	sActorPool
 		FileEquate		Filename;
 		sSpriteAnimBank	*ActorGfx;
 		int				CacheSlot;
-		sNodeList		*PoolCache;
+		sNodeList		*GlobalCache;
-		sNodeList		ActorCache;
+		sNodeList		LocalCache;
+		sNodeList		LastCache;
 		sActorPool		*Next;
 };
 
@@ -86,7 +88,9 @@ public:
 		void		AllocCache();
 		void		Reset();
 		void		LoadPalette(sActorPool *NewActor);
+		sPoolSlot	&GetSlot(int Slot)			{return(SlotList[Slot]);}
 		sNodeList	*GetSlotList(int Slot)		{return(&SlotList[Slot].NodeList);}
+		int			GetSlotCount()				{return(SlotCount);}
 
 static	sPoolNode	*RemoveHeadNode(sNodeList *Root);
 static	void		RemoveNode(sPoolNode *Node,sNodeList *Root);

source/level/level.cpp

@@ -165,7 +165,7 @@ bool	Finished=false;
 			if (Lvl>=LvlTableSize) Lvl=0;
 		}
 // End TMP
-//		Lvl&=3;	// Ch1 only Bodge
+		Lvl&=3;	// Ch1 only Bodge
 		return(Finished);
 }
 

source/platform/platform.cpp

@@ -507,8 +507,8 @@ void CNpcPlatform::postInit()
 			}
 		}
 
-		CFXJellyFishLegs	*T=(CFXJellyFishLegs*)CFX::Create(CFX::FX_TYPE_JELLYFISH_LEGS,this);
+//		CFXJellyFishLegs	*T=(CFXJellyFishLegs*)CFX::Create(CFX::FX_TYPE_JELLYFISH_LEGS,this);
-		T->SetUp(64,4,8,8);
+//		T->SetUp(64,4,8,8);
 	}
 }