From bfeef1bce5f9ad5b98632526f1462d9a5d9e8aff Mon Sep 17 00:00:00 2001
From: Paul <paul@localhost>
Date: Wed, 18 Apr 2001 22:39:51 +0000
Subject: [PATCH]

---
 source/pickups/pballoon.cpp |  1 +
 source/player/pmbloon.cpp   | 12 ------------
 source/player/pmbloon.h     |  1 -
 source/player/pmodes.cpp    |  1 -
 4 files changed, 1 insertion(+), 14 deletions(-)

diff --git a/source/pickups/pballoon.cpp b/source/pickups/pballoon.cpp
index 80d104f18..9d583b0c6 100644
--- a/source/pickups/pballoon.cpp
+++ b/source/pickups/pballoon.cpp
@@ -112,6 +112,7 @@ DVECTOR	CBalloonPickup::getSizeForPlacement()
 void	CBalloonPickup::collect(class CPlayer *_player)
 {
 	_player->setMode(PLAYER_MODE_BALLOON);
+	CSoundMediator::playSfx(CSoundMediator::SFX_BALLOON_INFLATE);
 	CBaseRespawningPickup::collect(_player);
 }
 
diff --git a/source/player/pmbloon.cpp b/source/player/pmbloon.cpp
index b4311f280..2e1973441 100644
--- a/source/player/pmbloon.cpp
+++ b/source/player/pmbloon.cpp
@@ -72,18 +72,6 @@ static PlayerMetrics	s_playerMetrics=
 }	};
 
 
-/*----------------------------------------------------------------------
-	Function:
-	Purpose:
-	Params:
-	Returns:
-  ---------------------------------------------------------------------- */
-void	CPlayerModeBalloon::enter()
-{
-	CPlayerModeBase::enter();
-	CSoundMediator::playSfx(CSoundMediator::SFX_BALLOON_INFLATE);
-}
-
 /*----------------------------------------------------------------------
 	Function:
 	Purpose:
diff --git a/source/player/pmbloon.h b/source/player/pmbloon.h
index 686f765c0..cfd7d945b 100644
--- a/source/player/pmbloon.h
+++ b/source/player/pmbloon.h
@@ -37,7 +37,6 @@
 class CPlayerModeBalloon : public CPlayerModeBase
 {
 public:
-	virtual void	enter();
 	virtual void	think();
 	virtual void	render(DVECTOR *_pos);
 
diff --git a/source/player/pmodes.cpp b/source/player/pmodes.cpp
index 126e90716..5fb23f419 100644
--- a/source/player/pmodes.cpp
+++ b/source/player/pmodes.cpp
@@ -442,7 +442,6 @@ void	CPlayerModeBase::playerHasHitGround()
 		setState(STATE_HITGROUND);
 		m_player->takeDamage(DAMAGE__FALL);
 		m_moveVelocity.vx=0;
-		CSoundMediator::playSfx(CSoundMediator::SFX_SPONGEBOB_LAND_AFTER_FALL);
 	}
 	else if(m_moveVelocity.vx)
 	{