source/pickups/pbubmix.cpp

@@ -25,6 +25,10 @@
 #include "utils\mathtab.h"
 #endif
 
+#ifndef	__PLAYER_PLAYER_H__
+#include "player\player.h"
+#endif
+
 
 /*	Std Lib
 	------- */
@@ -61,7 +65,7 @@
   ---------------------------------------------------------------------- */
 void	CBubbleMixturePickup::init()
 {
-	CBasePickup::init();
+	CBaseRespawningPickup::init();
 	m_sin=0;
 }
 
@@ -73,7 +77,19 @@ void	CBubbleMixturePickup::init()
   ---------------------------------------------------------------------- */
 void	CBubbleMixturePickup::collect(class CPlayer *_player)
 {
-	CBasePickup::collect(_player);
+	_player->setMode(PLAYER_MODE_BUBBLE_MIXTURE);
+	CBaseRespawningPickup::collect(_player);
+}
+
+/*----------------------------------------------------------------------
+	Function:
+	Purpose:
+	Params:
+	Returns:
+  ---------------------------------------------------------------------- */
+int		CBubbleMixturePickup::getRespawnTime()
+{
+	return 60*10;
 }
 
 /*----------------------------------------------------------------------

source/pickups/pbubmix.h

@@ -34,7 +34,7 @@
 	Structure defintions
 	-------------------- */
 
-class CBubbleMixturePickup : public CBasePickup
+class CBubbleMixturePickup : public CBaseRespawningPickup
 {
 public:
 	virtual void		init();
@@ -42,6 +42,8 @@ public:
 	virtual void		collect(class CPlayer *_player);
 
 protected:
+	virtual int			getRespawnTime();
+
 	virtual void		thinkPickup(int _frames);
 	virtual void		renderPickup(DVECTOR *_pos);
 

source/pickups/pickup.cpp

@@ -47,6 +47,10 @@
 #include "pickups\pbubmix.h"
 #endif
 
+#ifndef	__PICKUPS_PBLOWER_H__
+#include "pickups\pblower.h"
+#endif
+
 #ifndef	__PICKUPS_PGLASSES_H__
 #include "pickups\pglasses.h"
 #endif
@@ -323,6 +327,10 @@ CBasePickup	*createPickup(const PICKUP_TYPE _type,const DVECTOR *_pos)
 			pickup=new ("HelmetPickup") CHelmetPickup();
 			break;
 
+		case PICKUP__CORAL_BLOWER:
+			pickup=new ("CoralBlowerPickup") CCoralBlowerPickup();
+			break;
+
 		case PICKUP__QUEST_ITEM__TEST:
 			pickup=new ("QuestItemPickup") CTestQuestItemPickup();
 			break;

source/pickups/pickup.h

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