source/mem/memory.cpp

@@ -23,9 +23,9 @@ int			MemNodeCount=0;
 #endif
 
 #ifdef	USE_MEM_GUARDS
-static const unsigned int	HEAD_GUARD_FILL_PATTERN	=0x3c3c3c3c;
+static const unsigned int	HEAD_GUARD_FILL_PATTERN	=0x3e3e3e3e;
 static const unsigned int	MEM_FILL_PATTERN		=0x3d3d3d3d;
-static const unsigned int	TAIL_GUARD_FILL_PATTERN	=0x3e3e3e3e;
+static const unsigned int	TAIL_GUARD_FILL_PATTERN	=0x3c3c3c3c;
 static const unsigned int	NUM_MEM_GUARDS=2;
 static const unsigned int	MEM_GUARD_SIZE=sizeof(int)*NUM_MEM_GUARDS;
 #endif	/* USE_MEM_GUARDS */

source/pickups/pickup.cpp

@@ -430,8 +430,8 @@ CBasePickup	*createPickup(const PICKUP_TYPE _type,const DVECTOR *_pos)
 			pickup=new ("CoralBlowerPickup") CCoralBlowerPickup();
 			break;
 
-		case PICKUP__QUEST_ITEM__TEST:
+		case PICKUP__QUEST_ITEM:
-			pickup=new ("QuestItemPickup") CTestQuestItemPickup();
+			pickup=new ("QuestItemPickup") CQuestItemPickup();
 			break;
 
 		case PICKUP__BALLOON_AND_SPATULA:

source/pickups/pickup.h

@@ -46,7 +46,7 @@ typedef enum
 	PICKUP__BALLOON,
 	PICKUP__HELMET,
 	PICKUP__CORAL_BLOWER,
-	PICKUP__QUEST_ITEM__TEST,	// Needs to be one of these for each quest item ( I think )
+	PICKUP__QUEST_ITEM,
 	PICKUP__BALLOON_AND_SPATULA,
 	PICKUP__JELLY_LAUNCHER,
 }

source/pickups/pquest.cpp

@@ -33,6 +33,10 @@
 #include "gfx\otpos.h"
 #endif
 
+#ifndef __GAME_GAME_H__
+#include "game\game.h"
+#endif
+
 
 /*	Std Lib
 	------- */
@@ -45,35 +49,6 @@
 #endif
 
 
-
-/*
-Chapter 1
-	1 jelly
-	2 sea weed
-	3 seanut butter
-	4 slice of bread
-Chapter 2
-	1 false teeth
-	2 kelp kream
-	3 mud pack
-	4 sponge
-Chapter 3
-	1 clam bra
-	2 slippers
-	3 starfish mask
-	4 super pants
-Chapter 4
-	1 coin
-	2 coin
-	3 coin
-	4 kelp bar
-Chapter 5
-	1 ariel
-	2 hammer
-	3 oilcan
-	4 wrench
-*/
-
 /*----------------------------------------------------------------------
 	Tyepdefs && Defines
 	------------------- */
@@ -82,6 +57,13 @@ Chapter 5
 	Structure defintions
 	-------------------- */
 
+typedef struct
+{
+	u8		m_chapter,m_level;
+	u16		m_gfxFrame;
+} sQuestItemMap;
+
+
 /*----------------------------------------------------------------------
 	Function Prototypes
 	------------------- */
@@ -90,20 +72,65 @@ Chapter 5
 	Vars
 	---- */
 
+static const sQuestItemMap	s_questItemMap[]=
+{
+	{	1,1,	FRM__C1_L1_JELLY		},
+	{	1,2,	FRM__C1_L2_SEAWEED		},
+	{	1,3,	FRM__C1_L3_SEANUTBUTTER	},
+	{	1,4,	FRM__C1_L4_BREADSLICE	},
+	{	2,1,	FRM__C2_L1_FALSETEETH	},
+	{	2,2,	FRM__C2_L2_KELPKREAM	},
+	{	2,3,	FRM__C2_L3_MUDPACK		},
+	{	2,4,	FRM__C2_L4_SPONGE		},
+	{	3,1,	FRM__C3_L1_SLIPPERS		},
+	{	3,2,	FRM__C3_L2_CLAMBRA		},
+	{	3,3,	FRM__C3_L3_STARFISHMASK	},
+	{	3,4,	FRM__C3_L4_SUPERPANTZ	},
+	{	4,1,	FRM__C4_COIN			},
+	{	4,2,	FRM__C4_COIN			},
+	{	4,3,	FRM__C4_COIN			},
+	{	4,4,	FRM__C4_KELPBAR			},
+	{	5,1,	FRM__C5_L1_HAMMER		},
+	{	5,2,	FRM__C5_L2_ARIEL		},
+	{	5,3,	FRM__C5_L3_OILCAN		},
+	{	5,4,	FRM__C5_L4_WRENCH		},
+};
+static const int			s_numQuestItemMap=sizeof(s_questItemMap)/sizeof(sQuestItemMap);
+
+
 /*----------------------------------------------------------------------
 	Function:
 	Purpose:
 	Params:
 	Returns:
   ---------------------------------------------------------------------- */
-void	CBaseQuestItemPickup::init()
+void	CQuestItemPickup::init()
 {
+	int					chapter,level;
+	const sQuestItemMap	*qi;
+	int					i;
 	sFrameHdr			*fh;
 
+
 	CBasePickup::init();
 	m_pingFrame=0;
 
-	fh=getSpriteBank()->getFrameHeader(getFrameNumber());
+	chapter=GameScene.getChapterNumber();
+	level=GameScene.getLevelNumber();
+	m_gfxFrame=-1;
+	qi=s_questItemMap;
+	for(i=0;i<s_numQuestItemMap;i++)
+	{
+		if(qi->m_chapter==chapter&&qi->m_level==level)
+		{
+			m_gfxFrame=qi->m_gfxFrame;
+			break;
+		}
+		qi++;
+	}
+	ASSERT(m_gfxFrame!=-1);
+
+	fh=getSpriteBank()->getFrameHeader(m_gfxFrame);
 	setCollisionSize(fh->W,fh->H);
 }
 
@@ -113,12 +140,12 @@ void	CBaseQuestItemPickup::init()
 	Params:
 	Returns:
   ---------------------------------------------------------------------- */
-DVECTOR	CBaseQuestItemPickup::getSizeForPlacement()
+DVECTOR	CQuestItemPickup::getSizeForPlacement()
 {
 	DVECTOR		size;
 	sFrameHdr	*fh;
 
-	fh=getSpriteBank()->getFrameHeader(getFrameNumber());
+	fh=getSpriteBank()->getFrameHeader(m_gfxFrame);
 	size.vx=fh->W;
 	size.vy=fh->H;
 	return size;
@@ -130,7 +157,7 @@ DVECTOR	CBaseQuestItemPickup::getSizeForPlacement()
 	Params:
 	Returns:
   ---------------------------------------------------------------------- */
-void	CBaseQuestItemPickup::collect(class CPlayer *_player)
+void	CQuestItemPickup::collect(class CPlayer *_player)
 {
 	CBasePickup::collect(_player);
 }
@@ -149,7 +176,7 @@ int quest_transmode=1;
 	Params:
 	Returns:
   ---------------------------------------------------------------------- */
-int		CBaseQuestItemPickup::getVisibilityRadius()
+int		CQuestItemPickup::getVisibilityRadius()
 {
 	return quest_pingsize;
 }
@@ -160,7 +187,7 @@ int		CBaseQuestItemPickup::getVisibilityRadius()
 	Params:
 	Returns:
   ---------------------------------------------------------------------- */
-void	CBaseQuestItemPickup::thinkPickup(int _frames)
+void	CQuestItemPickup::thinkPickup(int _frames)
 {
 	m_pingFrame+=_frames;
 	if(m_pingFrame>(quest_pingframes+quest_pingwaitframes))
@@ -176,14 +203,14 @@ void	CBaseQuestItemPickup::thinkPickup(int _frames)
 	Params:
 	Returns:
   ---------------------------------------------------------------------- */
-void	CBaseQuestItemPickup::renderPickup(DVECTOR *_pos)
+void	CQuestItemPickup::renderPickup(DVECTOR *_pos)
 {
 	SpriteBank	*sprites;
 	sFrameHdr	*fh;
 	int			x,y;
 
 	sprites=getSpriteBank();
-	fh=sprites->getFrameHeader(getFrameNumber());
+	fh=sprites->getFrameHeader(m_gfxFrame);
 	x=_pos->vx-(fh->W/2);
 	y=_pos->vy-(fh->H/2);
 	sprites->printFT4(fh,x,y,0,0,OTPOS__PICKUP_POS);
@@ -234,18 +261,5 @@ void	CBaseQuestItemPickup::renderPickup(DVECTOR *_pos)
 }
 
 
-
-
-/*----------------------------------------------------------------------
-	Function:
-	Purpose:
-	Params:
-	Returns:
-  ---------------------------------------------------------------------- */
-int		CTestQuestItemPickup::getFrameNumber()
-{
-	return FRM__C2_L1_FALSETEETH;
-}
-
 /*===========================================================================
 end */

source/pickups/pquest.h

@@ -34,7 +34,7 @@
 	Structure defintions
 	-------------------- */
 
-class CBaseQuestItemPickup : public CBasePickup
+class CQuestItemPickup : public CBasePickup
 {
 public:
 	virtual void		init();
@@ -42,23 +42,14 @@ public:
 	virtual DVECTOR		getSizeForPlacement();
 	virtual void		collect(class CPlayer *_player);
 
-protected:
+private:
 	virtual int			getVisibilityRadius();
 
 	virtual void		thinkPickup(int _frames);
 	virtual void		renderPickup(DVECTOR *_pos);
 
-	virtual int			getFrameNumber()=0;
-
-private:
 	int					m_pingFrame;
-
+	int					m_gfxFrame;
-};
-
-class CTestQuestItemPickup : public CBaseQuestItemPickup
-{
-protected:
-	virtual int			getFrameNumber();
 
 };