zydronium/SBSPSS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Charles 2001-08-22 15:05:27 +00:00
parent 3ca19a1933
commit 1a64098e58
3 changed files with 10 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
source/fx/fxgeyser.cpp
View file

@ -93,7 +93,7 @@ int W;
{ {
Flags |= FX_FLAG_INJURE_PLAYER; Flags |= FX_FLAG_INJURE_PLAYER;
if ( SoundId == NOT_PLAYING ) if ( SoundId == NOT_PLAYING && !GameScene.getIsPaused() )
{ {
SoundId = (int) CSoundMediator::playSfx(CSoundMediator::SFX_OIL_GEYSER,true); SoundId = (int) CSoundMediator::playSfx(CSoundMediator::SFX_OIL_GEYSER,true);
} }

5
source/game/game.cpp
View file

@ -227,6 +227,8 @@ void CGameScene::init()
s_showBossTextOnRespawn=false; s_showBossTextOnRespawn=false;
m_playingBossMusic=false; m_playingBossMusic=false;
m_isPaused=false;
} }
/*****************************************************************************/ /*****************************************************************************/
// This is a seperate funtion ( and virtual ) so that we can overload it for // 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.. ) // Conversation think ( with pad debounce stuff.. )
if(CConversation::isActive())m_player->ignoreNewlyPressedButtonsOnPadThisThink(); if(CConversation::isActive())m_player->ignoreNewlyPressedButtonsOnPadThisThink();
if(!m_pauseMenu->isActive()) if(!m_pauseMenu->isActive())

4
source/game/game.h
View file

@ -148,6 +148,10 @@ static int s_showBossTextOnRespawn;
int m_musicStarted; int m_musicStarted;
public:
int getIsPaused() {return(m_isPaused);}
protected:
int m_isPaused;
}; };