From 9343dba3f7244adc05f7630274b511c39785f21b Mon Sep 17 00:00:00 2001 From: Paul Date: Fri, 3 Aug 2001 22:46:16 +0000 Subject: [PATCH] --- source/game/game.cpp | 2 +- source/player/player.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/source/game/game.cpp b/source/game/game.cpp index 4f634f965..d6d3074ec 100644 --- a/source/game/game.cpp +++ b/source/game/game.cpp @@ -457,7 +457,7 @@ void CGameScene::think_playing(int _frames) return; } - if(s_justHitBossArenaTrigger) + if(s_justHitBossArenaTrigger&&m_gamestate==GAMESTATE_PLAYING) { m_gamestate=GAMESTATE_FADING_INTO_BOSS_INTRO; CFader::setFadingOut(); diff --git a/source/player/player.cpp b/source/player/player.cpp index 2460b7098..3255c9c8b 100644 --- a/source/player/player.cpp +++ b/source/player/player.cpp @@ -1770,7 +1770,7 @@ void CPlayer::setAnimNo(int _animNo) void CPlayer::springPlayerUp(int _springHeight) { m_currentPlayerModeClass->springPlayerUp(_springHeight); - CSoundMediator::playSfx( CSoundMediator::SFX_BOUNCY_PLATFORM ); + CSoundMediator::playSfx(CSoundMediator::SFX_BOUNCY_PLATFORM,false,true); } /*----------------------------------------------------------------------