From d344b5e263b047de326c99f65d9212c9e8296744 Mon Sep 17 00:00:00 2001 From: Charles Date: Tue, 24 Jul 2001 19:23:40 +0000 Subject: [PATCH] --- source/platform/pbob.cpp | 11 ++--------- source/platform/pbranch.cpp | 2 -- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/source/platform/pbob.cpp b/source/platform/pbob.cpp index 7df08b377..9e0c95256 100644 --- a/source/platform/pbob.cpp +++ b/source/platform/pbob.cpp @@ -90,16 +90,9 @@ void CNpcBobbingPlatform::processMovement( int _frames ) moveY = 0; } - /*if ( Pos.vy + moveY < m_initPos.vy ) + if ( m_soundId == NOT_PLAYING ) { - Pos.vy = m_initPos.vy; - m_velocity = 0; - m_state = NPC_BOB_STOP; - moveY = 0; + m_soundId = (int) CSoundMediator::playSfx( CSoundMediator::SFX_SINKING_CRATE, true, true ); } - else - { - Pos.vy += moveY; - }*/ } } \ No newline at end of file diff --git a/source/platform/pbranch.cpp b/source/platform/pbranch.cpp index 3de6a9b1a..4afb288ec 100644 --- a/source/platform/pbranch.cpp +++ b/source/platform/pbranch.cpp @@ -122,7 +122,6 @@ void CNpcBranchPlatform::processMovement( int _frames ) if ( m_angularVelocity > 6 && newAngle < -20 ) { player->springPlayerUp(); - CSoundMediator::playSfx(CSoundMediator::SFX_SPONGEBOB_BUTTBOUNCE); } } else @@ -130,7 +129,6 @@ void CNpcBranchPlatform::processMovement( int _frames ) if ( m_angularVelocity < -6 && newAngle > 20 ) { player->springPlayerUp(); - CSoundMediator::playSfx(CSoundMediator::SFX_SPONGEBOB_BUTTBOUNCE); } }