From ee5e0f42ab0fc54ce1d967c71434e5f2176e04de Mon Sep 17 00:00:00 2001 From: Paul Date: Fri, 20 Jul 2001 15:24:04 +0000 Subject: [PATCH] --- source/pickups/pkelp.cpp | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/source/pickups/pkelp.cpp b/source/pickups/pkelp.cpp index 97f77352a..a5dbddbe8 100644 --- a/source/pickups/pkelp.cpp +++ b/source/pickups/pkelp.cpp @@ -138,17 +138,20 @@ void CKelpTokenPickup::renderPickup(DVECTOR *_pos) ---------------------------------------------------------------------- */ void CKelpTokenPickup::collidedWith(CThing *_thisThing) { - switch(_thisThing->getThingType()) + if(!isSetToShutdown()) { - case TYPE_PLAYER: - case TYPE_NPC: - collect((CPlayer*)_thisThing); - CSoundMediator::playSfx(sfxToPlayWhenCollected()); - break; + switch(_thisThing->getThingType()) + { + case TYPE_PLAYER: + case TYPE_NPC: + collect((CPlayer*)_thisThing); + CSoundMediator::playSfx(sfxToPlayWhenCollected()); + break; - default: - ASSERT(0); - break; + default: + ASSERT(0); + break; + } } }