This commit is contained in:
parent
3ca19a1933
commit
1a64098e58
@ -93,7 +93,7 @@ int W;
|
||||
{
|
||||
Flags |= FX_FLAG_INJURE_PLAYER;
|
||||
|
||||
if ( SoundId == NOT_PLAYING )
|
||||
if ( SoundId == NOT_PLAYING && !GameScene.getIsPaused() )
|
||||
{
|
||||
SoundId = (int) CSoundMediator::playSfx(CSoundMediator::SFX_OIL_GEYSER,true);
|
||||
}
|
||||
|
@ -227,6 +227,8 @@ void CGameScene::init()
|
||||
|
||||
s_showBossTextOnRespawn=false;
|
||||
m_playingBossMusic=false;
|
||||
|
||||
m_isPaused=false;
|
||||
}
|
||||
/*****************************************************************************/
|
||||
// This is a seperate funtion ( and virtual ) so that we can overload it for
|
||||
@ -651,6 +653,9 @@ void CGameScene::think_playing(int _frames)
|
||||
}
|
||||
}
|
||||
|
||||
// paused for pause menu or conversation?
|
||||
m_isPaused = m_pauseMenu->isActive() || CConversation::isActive();
|
||||
|
||||
// Conversation think ( with pad debounce stuff.. )
|
||||
if(CConversation::isActive())m_player->ignoreNewlyPressedButtonsOnPadThisThink();
|
||||
if(!m_pauseMenu->isActive())
|
||||
|
@ -148,6 +148,10 @@ static int s_showBossTextOnRespawn;
|
||||
|
||||
int m_musicStarted;
|
||||
|
||||
public:
|
||||
int getIsPaused() {return(m_isPaused);}
|
||||
protected:
|
||||
int m_isPaused;
|
||||
};
|
||||
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user