zydronium/SBSPSS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Paul 2001-07-24 16:22:28 +00:00
parent 3597faace0
commit cb552ecdfe
2 changed files with 5 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
source/pickups/pkelp.cpp
View file

@ -80,6 +80,8 @@ void CKelpTokenPickup::init()
fh=CGameScene::getSpriteBank()->getFrameHeader(FRM__TOKEN); fh=CGameScene::getSpriteBank()->getFrameHeader(FRM__TOKEN);
setCollisionSize(fh->W,fh->H); setCollisionSize(fh->W,fh->H);
m_collectedFlag=false;
} }
/*---------------------------------------------------------------------- /*----------------------------------------------------------------------
@ -109,6 +111,7 @@ void CKelpTokenPickup::collect(class CPlayer *_player)
{ {
CBasePickup::collect(_player); CBasePickup::collect(_player);
CGameSlotManager::getSlotData()->collectKelpToken(GameScene.getChapterNumber()-1,GameScene.getLevelNumber()-1,m_tokenNumber); CGameSlotManager::getSlotData()->collectKelpToken(GameScene.getChapterNumber()-1,GameScene.getLevelNumber()-1,m_tokenNumber);
m_collectedFlag=true;
} }
/*---------------------------------------------------------------------- /*----------------------------------------------------------------------
@ -138,7 +141,7 @@ void CKelpTokenPickup::renderPickup(DVECTOR *_pos)
---------------------------------------------------------------------- */ ---------------------------------------------------------------------- */
void CKelpTokenPickup::collidedWith(CThing *_thisThing) void CKelpTokenPickup::collidedWith(CThing *_thisThing)
{ {
if(!isSetToShutdown()) if(!m_collectedFlag)
{ {
switch(_thisThing->getThingType()) switch(_thisThing->getThingType())
{ {

1
source/pickups/pkelp.h
View file

@ -52,6 +52,7 @@ private:
virtual CSoundMediator::SFXID sfxToPlayWhenCollected(){return CSoundMediator::SFX_ITEM__ANY_OTHER_ITEM;}//SFX_ITEM__SKILL_ITEM;} virtual CSoundMediator::SFXID sfxToPlayWhenCollected(){return CSoundMediator::SFX_ITEM__ANY_OTHER_ITEM;}//SFX_ITEM__SKILL_ITEM;}
int m_tokenNumber; int m_tokenNumber;
int m_collectedFlag;
}; };