source/pickups/pballoon.cpp

@@ -73,8 +73,13 @@
   ---------------------------------------------------------------------- */
 void	CBalloonPickup::init()
 {
+	sFrameHdr	*fh;
+
 	CBaseRespawningPickup::init();
 	m_sin=0;
+
+	fh=getSpriteBank()->getFrameHeader(FRM__BALLOON);
+	setCollisionSize(fh->W,fh->H);
 }
 
 /*----------------------------------------------------------------------
@@ -151,6 +156,7 @@ void	CBalloonPickup::renderPickup(DVECTOR *_pos)
 	x=_pos->vx-(fh->W/2);
 	y=_pos->vy-(fh->H/2);
 	sprites->printFT4(fh,x+xo1,y,0,0,PICKUPS_OT_POS);
+setCollisionCentreOffset(xo1,0);
 
 	x=_pos->vx;
 	y=_pos->vy+(fh->H/2);

source/pickups/pbubmix.cpp

@@ -65,17 +65,6 @@ void	CBubbleMixturePickup::init()
 	m_sin=0;
 }
 
-/*----------------------------------------------------------------------
-	Function:
-	Purpose:
-	Params:
-	Returns:
-  ---------------------------------------------------------------------- */
-void	CBubbleMixturePickup::shutdown()
-{
-	CBasePickup::shutdown();
-}
-
 /*----------------------------------------------------------------------
 	Function:
 	Purpose:

source/pickups/pbubmix.h

@@ -38,7 +38,6 @@ class CBubbleMixturePickup : public CBasePickup
 {
 public:
 	virtual void		init();
-	virtual void		shutdown();
 
 	virtual void		collect(class CPlayer *_player);
 

source/pickups/phealth.cpp

@@ -65,17 +65,6 @@ void	CBaseHealthPickup::init()
 	m_sin=0;
 }
 
-/*----------------------------------------------------------------------
-	Function:
-	Purpose:
-	Params:
-	Returns:
-  ---------------------------------------------------------------------- */
-void	CBaseHealthPickup::shutdown()
-{
-	CBasePickup::shutdown();
-}
-
 /*----------------------------------------------------------------------
 	Function:
 	Purpose:

source/pickups/phealth.h

@@ -38,7 +38,6 @@ class CBaseHealthPickup : public CBasePickup
 {
 public:
 	virtual void		init();
-	virtual void		shutdown();
 
 	virtual void		collect(class CPlayer *_player);
 

source/pickups/pickup.cpp

@@ -103,7 +103,7 @@
   ---------------------------------------------------------------------- */
 void	CBasePickup::init()
 {
-	CThing::init();
+	CPickupThing::init();
 
 	m_spriteBank=new ("pickup sprite") SpriteBank();
 	m_spriteBank->load(INGAMEFX_INGAMEFX_SPR);
@@ -118,7 +118,7 @@ void	CBasePickup::init()
 void	CBasePickup::shutdown()
 {
 	m_spriteBank->dump();	delete m_spriteBank;
-	CThing::shutdown();
+	CPickupThing::shutdown();
 }
 
 /*----------------------------------------------------------------------
@@ -130,7 +130,7 @@ void	CBasePickup::shutdown()
 #include "pad\pads.h"
 void	CBasePickup::think(int _frames)
 {
-	CThing::think(_frames);
+	CPickupThing::think(_frames);
 	thinkPickup(_frames);
 
 if(PadGetDown(0)&PAD_L2)
@@ -150,7 +150,7 @@ void	CBasePickup::render()
 	DVECTOR	ofs,pos;
 	int		visibilityRadius;
 	
-	CThing::render();
+	CPickupThing::render();
 	
 	ofs=CLevel::getCameraPos();
 	pos.vx=Pos.vx-ofs.vx;
@@ -167,6 +167,26 @@ void	CBasePickup::render()
 	*/
 }
 
+/*----------------------------------------------------------------------
+	Function:
+	Purpose:
+	Params:
+	Returns:
+  ---------------------------------------------------------------------- */
+void	CBasePickup::collidedWith(CThing *_thisThing)
+{
+	switch(_thisThing->getThingType())
+	{
+		case TYPE_PLAYER:
+			collect((CPlayer*)_thisThing);
+			break;
+
+		default:
+			ASSERT(0);
+			break;
+	}
+}
+
 /*----------------------------------------------------------------------
 	Function:
 	Purpose:

source/pickups/pickup.h

@@ -18,8 +18,8 @@
 	Includes
 	-------- */
 
-#ifndef __GAME_THING_H__
-#include "game/thing.h"
+#ifndef __GAME_TPICKUP_H__
+#include "thing/tpickup.h"
 #endif
 
 
@@ -52,7 +52,7 @@ PICKUP_TYPE;
 	Structure defintions
 	-------------------- */
 
-class CBasePickup : public CThing
+class CBasePickup : public CPickupThing
 {
 public:
 	virtual void		init();
@@ -76,6 +76,8 @@ protected:
 	virtual void		thinkPickup(int _Frames)			{;}
 	virtual void		renderPickup(DVECTOR *_pos)=0;
 
+	virtual void		collidedWith(CThing *_thisThing);
+
 private:
 	class SpriteBank	*m_spriteBank;
 

source/pickups/pjlammo.cpp

@@ -65,17 +65,6 @@ void	CJellyLauncherAmmoPickup::init()
 	m_rattle=0;
 }
 
-/*----------------------------------------------------------------------
-	Function:
-	Purpose:
-	Params:
-	Returns:
-  ---------------------------------------------------------------------- */
-void	CJellyLauncherAmmoPickup::shutdown()
-{
-	CBasePickup::shutdown();
-}
-
 /*----------------------------------------------------------------------
 	Function:
 	Purpose:

source/pickups/pjlammo.h

@@ -38,7 +38,6 @@ class CJellyLauncherAmmoPickup : public CBasePickup
 {
 public:
 	virtual void		init();
-	virtual void		shutdown();
 
 	virtual void		collect(class CPlayer *_player);
 

source/pickups/plife.cpp

@@ -65,17 +65,6 @@ void	CLifePickup::init()
 	m_sin=0;
 }
 
-/*----------------------------------------------------------------------
-	Function:
-	Purpose:
-	Params:
-	Returns:
-  ---------------------------------------------------------------------- */
-void	CLifePickup::shutdown()
-{
-	CBasePickup::shutdown();
-}
-
 /*----------------------------------------------------------------------
 	Function:
 	Purpose:

source/pickups/plife.h

@@ -38,7 +38,6 @@ class CLifePickup : public CBasePickup
 {
 public:
 	virtual void		init();
-	virtual void		shutdown();
 
 	virtual void		collect(class CPlayer *_player);
 

source/pickups/pquest.cpp

@@ -69,17 +69,6 @@ void	CBaseQuestItemPickup::init()
 	m_pingFrame=0;
 }
 
-/*----------------------------------------------------------------------
-	Function:
-	Purpose:
-	Params:
-	Returns:
-  ---------------------------------------------------------------------- */
-void	CBaseQuestItemPickup::shutdown()
-{
-	CBasePickup::shutdown();
-}
-
 /*----------------------------------------------------------------------
 	Function:
 	Purpose:

source/pickups/pquest.h

@@ -38,7 +38,6 @@ class CBaseQuestItemPickup : public CBasePickup
 {
 public:
 	virtual void		init();
-	virtual void		shutdown();
 
 	virtual void		collect(class CPlayer *_player);
 

source/pickups/pshoes.cpp

@@ -65,17 +65,6 @@ void	CShoesPickup::init()
 	m_sin=0;
 }
 
-/*----------------------------------------------------------------------
-	Function:
-	Purpose:
-	Params:
-	Returns:
-  ---------------------------------------------------------------------- */
-void	CShoesPickup::shutdown()
-{
-	CBasePickup::shutdown();
-}
-
 /*----------------------------------------------------------------------
 	Function:
 	Purpose:

source/pickups/pshoes.h

@@ -38,7 +38,6 @@ class CShoesPickup : public CBasePickup
 {
 public:
 	virtual void		init();
-	virtual void		shutdown();
 
 	virtual void		collect(class CPlayer *_player);
 

source/pickups/pspatula.cpp

@@ -61,17 +61,6 @@ void	CSpatulaPickup::init()
 	m_glint=0;
 }
 
-/*----------------------------------------------------------------------
-	Function:
-	Purpose:
-	Params:
-	Returns:
-  ---------------------------------------------------------------------- */
-void	CSpatulaPickup::shutdown()
-{
-	CBasePickup::shutdown();
-}
-
 /*----------------------------------------------------------------------
 	Function:
 	Purpose:

source/pickups/pspatula.h

@@ -38,7 +38,6 @@ class CSpatulaPickup : public CBasePickup
 {
 public:
 	virtual void		init();
-	virtual void		shutdown();
 
 	virtual void		collect(class CPlayer *_player);