source/pickups/pickup.cpp

@@ -348,10 +348,13 @@ CBasePickup	*createPickup(const PICKUP_TYPE _type,const DVECTOR *_pos)
 			pickup=new ("QuestItemPickup") CTestQuestItemPickup();
 			break;
 
+		case PICKUP__BALLOON_AND_SPATULA:
+			pickup=new ("BalloonAndSpatulaPickup") CBalloonAndSpatulaPickup();
+			break;
+
 		default:
 			ASSERT(!"UNKNOWN PICKUP TYPE");
-			pickup=NULL;
-			break;
+			return NULL;
 	}
 
 	pickup->init();

source/pickups/pickup.h

@@ -47,6 +47,7 @@ typedef enum
 	PICKUP__HELMET,
 	PICKUP__CORAL_BLOWER,
 	PICKUP__QUEST_ITEM__TEST,	// Needs to be one of these for each quest item ( I think )
+	PICKUP__BALLOON_AND_SPATULA,
 }
 PICKUP_TYPE;
 

source/pickups/pquest.cpp

@@ -235,7 +235,7 @@ void	CBaseQuestItemPickup::renderPickup(DVECTOR *_pos)
   ---------------------------------------------------------------------- */
 int		CTestQuestItemPickup::getFrameNumber()
 {
-	return FRM__TEETH;
+	return FRM__C2_L1_FALSETEETH;
 }
 
 /*===========================================================================

source/pickups/pspatula.cpp

@@ -138,5 +138,28 @@ void	CSpatulaPickup::renderPickup(DVECTOR *_pos)
 	}
 }
 
+
+
+
+/*----------------------------------------------------------------------
+	Function:
+	Purpose:
+	Params:
+	Returns:
+  ---------------------------------------------------------------------- */
+void	CBalloonAndSpatulaPickup::thinkPickup(int _frames)
+{
+}
+
+/*----------------------------------------------------------------------
+	Function:
+	Purpose:
+	Params:
+	Returns:
+  ---------------------------------------------------------------------- */
+void	CBalloonAndSpatulaPickup::renderPickup(DVECTOR *_pos)
+{
+}
+
 /*===========================================================================
 end */

source/pickups/pspatula.h

@@ -51,6 +51,13 @@ private:
 	int					m_glintRot;
 };
 
+class CBalloonAndSpatulaPickup : public CSpatulaPickup
+{
+protected:
+	virtual void		thinkPickup(int _frames);
+	virtual void		renderPickup(DVECTOR *_pos);
+};
+
 
 /*----------------------------------------------------------------------
 	Globals