makefile.gfx

@@ -196,7 +196,12 @@ INGAMEFX_GFX_NONTRANS_IN :=	$(foreach FILE,$(INGAMEFX_GFX_NONTRANS),$(INGAMEFX_N
 PICKUP_GFX_DIR :=			$(GRAF_DIR)/pickups
 PICKUP_GFX :=				+spatula +pants +health100 +health50 +health25 +glint1 +glint2 +glint3 +glint4 \
 							+jellyammo +bubblemixture +bubblewand +glasses +shoe +balloon +helmet \
-							+teeth +blower +net
+							+blower +net \
+							+c1_l1_jelly +c1_l2_seaweed +c1_l3_seanutbutter +c1_l4_breadslice \
+							+c2_l1_falseteeth +c2_l2_kelpkream +c2_l3_mudpack +c2_l4_sponge \
+							+c3_l1_slippers +c3_l2_clambra +c3_l3_starfishmask +c3_l4_superpantz \
+							+c4_coin +c4_kelpbar \
+							+c5_l1_hammer +c5_l2_ariel +c5_l3_oilcan +c5_l4_wrench
 PICKUP_GFX_IN :=			$(foreach FILE,$(PICKUP_GFX),$(PICKUP_GFX_DIR)/$(FILE).bmp)
 
 INGAMEFX_GFX_TRANS :=		+bubble_1 +bubble_2 +bubble_3 \
@@ -270,8 +275,8 @@ ingamefx:		$(INGAMEFX_GFX_TEX_IN)
 ####
 
 $(INGAMEFX_GFX_TEX_OUT) :	$(INGAMEFX_GFX_TEX_IN)
-		@parkgrab	-z+ ${INGAMEFX_GFX_TRANS_IN} ${PICKUP_GFX_IN} \
+		@parkgrab	-c+ -z+ ${INGAMEFX_GFX_TRANS_IN} ${PICKUP_GFX_IN} \
-					-z- ${INGAMEFX_GFX_NONTRANS_IN} -b+ \
+					-c- -z- ${INGAMEFX_GFX_NONTRANS_IN} -b+ \
 					-c+ -z+ $(UI_GFX_FONT_IN) ${UI_GFX_TRANS_IN} \
 					-c- -z- ${UI_GFX_NONTRANS_IN} \
 					-t:14,2,1 -l:$(REPORT_DIR)/ingamefx.lbm -o:$(INGAMEFX_GFX_TEX_OUT) -k:$(INGAMEFX_GFX_REP_FILE)

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;
+			return NULL;
-			break;
 	}
 
 	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

tools/MapEdit/Item.ini

@@ -52,4 +52,4 @@ Gfx=..\..\graphics\pickups\+helmet.bmp
 Gfx=..\..\graphics\pickups\+blower.bmp
 
 [Quest_Item]
-Gfx=..\..\graphics\pickups\+teeth.bmp
+Gfx=..\..\graphics\pickups\+questitem.bmp