source/pickups/pblower.cpp

@@ -57,6 +57,22 @@
 	Vars
 	---- */
 
+/*----------------------------------------------------------------------
+	Function:
+	Purpose:
+	Params:
+	Returns:
+  ---------------------------------------------------------------------- */
+void	CCoralBlowerPickup::init()
+{
+	sFrameHdr	*fh;
+
+	CBasePickup::init();
+
+	fh=getSpriteBank()->getFrameHeader(FRM__BLOWER);
+	setCollisionSize(fh->W,fh->H);
+}
+
 /*----------------------------------------------------------------------
 	Function:
 	Purpose:

source/pickups/pblower.h

@@ -37,6 +37,7 @@
 class CCoralBlowerPickup : public CBasePickup
 {
 public:
+	virtual void		init();
 	virtual DVECTOR		getSizeForPlacement();
 	virtual void		collect(class CPlayer *_player);
 

source/pickups/pbubmix.cpp

@@ -69,8 +69,13 @@
   ---------------------------------------------------------------------- */
 void	CBubbleMixturePickup::init()
 {
+	sFrameHdr	*fh;
+
 	CBaseRespawningPickup::init();
 	m_sin=0;
+
+	fh=getSpriteBank()->getFrameHeader(FRM__BUBBLEMIXTURE);
+	setCollisionSize(fh->W,fh->H);
 }
 
 /*----------------------------------------------------------------------
@@ -156,7 +161,12 @@ void	CBubbleMixturePickup::renderPickup(DVECTOR *_pos)
   ---------------------------------------------------------------------- */
 void	CBubbleWandPickup::init()
 {
+	sFrameHdr	*fh;
+
 	CBaseRespawningPickup::init();
+
+	fh=getSpriteBank()->getFrameHeader(FRM__BUBBLEWAND);
+	setCollisionSize(fh->W,fh->H);
 }
 
 /*----------------------------------------------------------------------

source/pickups/pglasses.cpp

@@ -65,10 +65,15 @@
   ---------------------------------------------------------------------- */
 void	CGlassesPickup::init()
 {
+	sFrameHdr	*fh;
+
 	CBasePickup::init();
 
 	m_glint=0;
 	m_glintRot=0;
+
+	fh=getSpriteBank()->getFrameHeader(FRM__GLASSES);
+	setCollisionSize(fh->W,fh->H);
 }
 
 /*----------------------------------------------------------------------

source/pickups/phealth.cpp

@@ -69,8 +69,13 @@
   ---------------------------------------------------------------------- */
 void	CBaseHealthPickup::init()
 {
+	sFrameHdr	*fh;
+
 	CBasePickup::init();
 	m_sin=0;
+
+	fh=getSpriteBank()->getFrameHeader(getFrameNumber());
+	setCollisionSize(fh->W,fh->H);
 }
 
 /*----------------------------------------------------------------------

source/pickups/phelmet.cpp

@@ -57,6 +57,22 @@
 	Vars
 	---- */
 
+/*----------------------------------------------------------------------
+	Function:
+	Purpose:
+	Params:
+	Returns:
+  ---------------------------------------------------------------------- */
+void	CHelmetPickup::init()
+{
+	sFrameHdr	*fh;
+
+	CBasePickup::init();
+
+	fh=getSpriteBank()->getFrameHeader(FRM__HELMET);
+	setCollisionSize(fh->W,fh->H);
+}
+	
 /*----------------------------------------------------------------------
 	Function:
 	Purpose:

source/pickups/phelmet.h

@@ -37,6 +37,7 @@
 class CHelmetPickup : public CBasePickup
 {
 public:
+	virtual void		init();
 	virtual DVECTOR		getSizeForPlacement();
 	virtual void		collect(class CPlayer *_player);
 

source/pickups/pjlammo.cpp

@@ -69,8 +69,13 @@
   ---------------------------------------------------------------------- */
 void	CJellyLauncherAmmoPickup::init()
 {
+	sFrameHdr	*fh;
+
 	CBasePickup::init();
 	m_rattle=0;
+
+	fh=getSpriteBank()->getFrameHeader(FRM__JELLYAMMO);
+	setCollisionSize(fh->W,fh->H);
 }
 
 /*----------------------------------------------------------------------

source/pickups/plife.cpp

@@ -69,8 +69,13 @@
   ---------------------------------------------------------------------- */
 void	CLifePickup::init()
 {
+	sFrameHdr	*fh;
+
 	CBasePickup::init();
 	m_sin=0;
+
+	fh=getSpriteBank()->getFrameHeader(FRM__PANTS);
+	setCollisionSize(fh->W,fh->H);
 }
 
 /*----------------------------------------------------------------------

source/pickups/plife.h

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

source/pickups/pnet.cpp

@@ -57,6 +57,22 @@
 	Vars
 	---- */
 
+/*----------------------------------------------------------------------
+	Function:
+	Purpose:
+	Params:
+	Returns:
+  ---------------------------------------------------------------------- */
+void	CNetPickup::init()
+{
+	sFrameHdr	*fh;
+
+	CBasePickup::init();
+
+	fh=getSpriteBank()->getFrameHeader(FRM__NET);
+	setCollisionSize(fh->W,fh->H);
+}
+
 /*----------------------------------------------------------------------
 	Function:
 	Purpose:

source/pickups/pnet.h

@@ -37,6 +37,7 @@
 class CNetPickup : public CBasePickup
 {
 public:
+	virtual void		init();
 	virtual DVECTOR		getSizeForPlacement();
 	virtual void		collect(class CPlayer *_player);
 

source/pickups/pquest.cpp

@@ -98,8 +98,13 @@ Chapter 5
   ---------------------------------------------------------------------- */
 void	CBaseQuestItemPickup::init()
 {
+	sFrameHdr	*fh;
+
 	CBasePickup::init();
 	m_pingFrame=0;
+
+	fh=getSpriteBank()->getFrameHeader(getFrameNumber());
+	setCollisionSize(fh->W,fh->H);
 }
 
 /*----------------------------------------------------------------------

source/pickups/pshoes.cpp

@@ -69,8 +69,13 @@
   ---------------------------------------------------------------------- */
 void	CShoesPickup::init()
 {
+	sFrameHdr	*fh;
+
 	CBaseRespawningPickup::init();
 	m_sin=0;
+
+	fh=getSpriteBank()->getFrameHeader(FRM__SHOE);
+	setCollisionSize(fh->W,fh->H);
 }
 
 /*----------------------------------------------------------------------

source/pickups/pspatula.cpp

@@ -65,9 +65,14 @@
   ---------------------------------------------------------------------- */
 void	CSpatulaPickup::init()
 {
+	sFrameHdr	*fh;
+
 	CBasePickup::init();
 	m_glint=0;
 	m_glintRot=0;
+
+	fh=getSpriteBank()->getFrameHeader(FRM__SPATULA);
+	setCollisionSize(fh->W,fh->H);
 }
 
 /*----------------------------------------------------------------------