From cddc41f0a7fc643de5a2e85c5e16f1f14c70699a Mon Sep 17 00:00:00 2001 From: Paul Date: Fri, 20 Apr 2001 16:57:05 +0000 Subject: [PATCH] --- source/pickups/pblower.cpp | 16 ++++++++++++++++ source/pickups/pblower.h | 1 + source/pickups/pbubmix.cpp | 10 ++++++++++ source/pickups/pglasses.cpp | 5 +++++ source/pickups/phealth.cpp | 5 +++++ source/pickups/phelmet.cpp | 16 ++++++++++++++++ source/pickups/phelmet.h | 1 + source/pickups/pjlammo.cpp | 5 +++++ source/pickups/plife.cpp | 5 +++++ source/pickups/plife.h | 1 - source/pickups/pnet.cpp | 16 ++++++++++++++++ source/pickups/pnet.h | 1 + source/pickups/pquest.cpp | 5 +++++ source/pickups/pshoes.cpp | 5 +++++ source/pickups/pspatula.cpp | 5 +++++ 15 files changed, 96 insertions(+), 1 deletion(-) diff --git a/source/pickups/pblower.cpp b/source/pickups/pblower.cpp index 2846fb0d6..46a910512 100644 --- a/source/pickups/pblower.cpp +++ b/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: diff --git a/source/pickups/pblower.h b/source/pickups/pblower.h index 498e72a0c..0a501b6c7 100644 --- a/source/pickups/pblower.h +++ b/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); diff --git a/source/pickups/pbubmix.cpp b/source/pickups/pbubmix.cpp index 934022696..719bae0e3 100644 --- a/source/pickups/pbubmix.cpp +++ b/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); } /*---------------------------------------------------------------------- diff --git a/source/pickups/pglasses.cpp b/source/pickups/pglasses.cpp index fe633a08c..2d9f6a9d8 100644 --- a/source/pickups/pglasses.cpp +++ b/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); } /*---------------------------------------------------------------------- diff --git a/source/pickups/phealth.cpp b/source/pickups/phealth.cpp index 9215cf7ee..79211e7b4 100644 --- a/source/pickups/phealth.cpp +++ b/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); } /*---------------------------------------------------------------------- diff --git a/source/pickups/phelmet.cpp b/source/pickups/phelmet.cpp index 9098bf57f..87d3a36e5 100644 --- a/source/pickups/phelmet.cpp +++ b/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: diff --git a/source/pickups/phelmet.h b/source/pickups/phelmet.h index 193e78711..77183e50d 100644 --- a/source/pickups/phelmet.h +++ b/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); diff --git a/source/pickups/pjlammo.cpp b/source/pickups/pjlammo.cpp index bc0ad383b..b8e9bce28 100644 --- a/source/pickups/pjlammo.cpp +++ b/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); } /*---------------------------------------------------------------------- diff --git a/source/pickups/plife.cpp b/source/pickups/plife.cpp index cd48c5868..c0b162721 100644 --- a/source/pickups/plife.cpp +++ b/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); } /*---------------------------------------------------------------------- diff --git a/source/pickups/plife.h b/source/pickups/plife.h index 577bb7cd6..788d21347 100644 --- a/source/pickups/plife.h +++ b/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); diff --git a/source/pickups/pnet.cpp b/source/pickups/pnet.cpp index 22fd05cf5..e98fde434 100644 --- a/source/pickups/pnet.cpp +++ b/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: diff --git a/source/pickups/pnet.h b/source/pickups/pnet.h index bd248678d..ee8b61279 100644 --- a/source/pickups/pnet.h +++ b/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); diff --git a/source/pickups/pquest.cpp b/source/pickups/pquest.cpp index 29d458adb..11be65354 100644 --- a/source/pickups/pquest.cpp +++ b/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); } /*---------------------------------------------------------------------- diff --git a/source/pickups/pshoes.cpp b/source/pickups/pshoes.cpp index 723086add..3e9a9ee81 100644 --- a/source/pickups/pshoes.cpp +++ b/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); } /*---------------------------------------------------------------------- diff --git a/source/pickups/pspatula.cpp b/source/pickups/pspatula.cpp index 3fd33921e..a65d324b5 100644 --- a/source/pickups/pspatula.cpp +++ b/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); } /*----------------------------------------------------------------------