source/pickups/pballoon.cpp

@@ -117,7 +117,6 @@ DVECTOR	CBalloonPickup::getSizeForPlacement()
 void	CBalloonPickup::collect(class CPlayer *_player)
 {
 	_player->setMode(PLAYER_MODE_BALLOON);
-	CSoundMediator::playSfx(CSoundMediator::SFX_BALLOON_INFLATE);
 	CBaseWeaponPickup::collect(_player);
 }
 

source/pickups/pballoon.h

@@ -50,6 +50,8 @@ protected:
 	virtual void		renderPickup(DVECTOR *_pos);
 
 private:
+	virtual CSoundMediator::SFXID	sfxToPlayWhenCollected(){return CSoundMediator::SFX_BALLOON_INFLATE;}
+
 	int					m_sin;
 
 };

source/pickups/pblower.h

@@ -43,6 +43,8 @@ public:
 protected:
 	virtual int			getWeaponSpriteFrame();
 
+private:
+	virtual CSoundMediator::SFXID	sfxToPlayWhenCollected(){return CSoundMediator::SFX_ITEM__CORAL_BLOWER;}
 };
 
 

source/pickups/pbubmix.h

@@ -49,6 +49,8 @@ protected:
 	virtual void		renderPickup(DVECTOR *_pos);
 
 private:
+	virtual CSoundMediator::SFXID	sfxToPlayWhenCollected(){return CSoundMediator::SFX_ITEM__JAMJAR_AMMO;}
+
 	int					m_sin;
 
 };

source/pickups/pglasses.cpp

@@ -109,7 +109,6 @@ DVECTOR	CGlassesPickup::getSizeForPlacement()
 void	CGlassesPickup::collect(class CPlayer *_player)
 {
 	_player->giveGlasses();
-	CSoundMediator::playSfx(CSoundMediator::SFX_GLASSES_ON);
 	CBasePickup::collect(_player);
 }
 

source/pickups/pglasses.h

@@ -47,6 +47,8 @@ protected:
 	virtual void		renderPickup(DVECTOR *_pos);
 
 private:
+	virtual CSoundMediator::SFXID	sfxToPlayWhenCollected(){return CSoundMediator::SFX_GLASSES_ON;}
+
 	int					m_glint;
 	int					m_glintRot;
 

source/pickups/phelmet.cpp

@@ -101,7 +101,6 @@ void	CHelmetPickup::collect(class CPlayer *_player)
 {
 	_player->giveDivingHelmet();
 	CBasePickup::collect(_player);
-	CSoundMediator::playSfx(CSoundMediator::SFX_SPONGEBOB_DIVING_HELMET);
 }
 
 /*----------------------------------------------------------------------

source/pickups/pickup.cpp

@@ -184,6 +184,7 @@ void	CBasePickup::collidedWith(CThing *_thisThing)
 	{
 		case TYPE_PLAYER:
 			collect((CPlayer*)_thisThing);
+			CSoundMediator::playSfx(sfxToPlayWhenCollected());
 			break;
 
 		default:
@@ -339,6 +340,7 @@ void	CBaseWeaponPickup::collidedWith(CThing *_thisThing)
 				   (!m_dontAutoPickUpUntilPlayerMovesOffMe&&player->tryingToAutomaticallyPickupWeapon()))
 				{
 					collect(player);
+					CSoundMediator::playSfx(sfxToPlayWhenCollected());
 				}
 				else
 				{

source/pickups/pickup.h

@@ -22,6 +22,10 @@
 #include "thing/thing.h"
 #endif
 
+#ifndef __SOUND_SOUND_H__
+#include "sound\sound.h"
+#endif
+
 
 /*	Std Lib
 	------- */
@@ -88,7 +92,9 @@ protected:
 
 	virtual void		collidedWith(CThing *_thisThing);
 
+
 private:
+	virtual CSoundMediator::SFXID	sfxToPlayWhenCollected(){return CSoundMediator::SFX_ITEM__ANY_OTHER_ITEM;}
 
 };
 
@@ -123,6 +129,9 @@ protected:
 	int					m_dontAutoPickUpUntilPlayerMovesOffMe;
 	int					m_collidedWithPlayer;
 
+private:
+	virtual CSoundMediator::SFXID	sfxToPlayWhenCollected(){return CSoundMediator::SFX_ITEM__POWER_UP_ITEM;}
+
 };
 
 

source/pickups/pjlammo.h

@@ -46,6 +46,8 @@ protected:
 	virtual void		renderPickup(DVECTOR *_pos);
 
 private:
+	virtual CSoundMediator::SFXID	sfxToPlayWhenCollected(){return CSoundMediator::SFX_ITEM__JAMJAR_AMMO;}
+
 	int					m_rattle;
 };
 

source/pickups/pkelp.cpp

@@ -108,7 +108,7 @@ DVECTOR	CKelpTokenPickup::getSizeForPlacement()
 void	CKelpTokenPickup::collect(class CPlayer *_player)
 {
 	CBasePickup::collect(_player);
-//	CGameSlotManager::getSlotData()->collectSpatula(GameScene.getChapterNumber(),GameScene.getLevelNumber(),m_spatulaNumber);
+	CGameSlotManager::getSlotData()->collectKelpToken(GameScene.getChapterNumber()-1,GameScene.getLevelNumber()-1,m_tokenNumber);
 }
 
 /*----------------------------------------------------------------------

source/pickups/pkelp.h

@@ -48,6 +48,8 @@ protected:
 	virtual void		renderPickup(DVECTOR *_pos);
 
 private:
+	virtual CSoundMediator::SFXID	sfxToPlayWhenCollected(){return CSoundMediator::SFX_ITEM__SKILL_ITEM;}
+
 	int					m_tokenNumber;
 };
 

source/pickups/pquest.h

@@ -48,6 +48,8 @@ private:
 	virtual void		thinkPickup(int _frames);
 	virtual void		renderPickup(DVECTOR *_pos);
 
+	virtual CSoundMediator::SFXID	sfxToPlayWhenCollected(){return CSoundMediator::SFX_ITEM__LEVEL_ITEM;}
+
 	int					m_pingFrame;
 	int					m_gfxFrame;
 

source/pickups/pspatula.h

@@ -53,6 +53,8 @@ protected:
 	virtual void		renderPickup(DVECTOR *_pos);
 
 private:
+	virtual CSoundMediator::SFXID	sfxToPlayWhenCollected(){return CSoundMediator::SFX_ITEM__SKILL_ITEM;}
+
 	int					m_glint;
 	int					m_glintRot;
 	int					m_spatulaNumber;