This commit is contained in:
parent
b491c4c10b
commit
45369125bf
3 changed files with 14 additions and 1 deletions
|
@ -341,7 +341,7 @@ PAUL_DBGMSG("LETS TRY AGAIN!");
|
||||||
m_continueFontOffset-=move;
|
m_continueFontOffset-=move;
|
||||||
if(m_continueFontOffset<0)
|
if(m_continueFontOffset<0)
|
||||||
{
|
{
|
||||||
if(m_state==STATE__SPEECH_BEFORE_EXITING_TO_GAME)
|
if(m_state==STATE__SPEECH_BEFORE_EXITING_TO_GAME&&!CSoundMediator::isSpeechPlaying())
|
||||||
{
|
{
|
||||||
m_readyToExit=true;
|
m_readyToExit=true;
|
||||||
CFader::setFadingOut();
|
CFader::setFadingOut();
|
||||||
|
|
|
@ -718,6 +718,18 @@ void CSoundMediator::stopSpeech()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*----------------------------------------------------------------------
|
||||||
|
Function:
|
||||||
|
Purpose:
|
||||||
|
Params:
|
||||||
|
Returns:
|
||||||
|
---------------------------------------------------------------------- */
|
||||||
|
int CSoundMediator::isSpeechPlaying()
|
||||||
|
{
|
||||||
|
return CXAStream::IsPlaying();
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/*----------------------------------------------------------------------
|
/*----------------------------------------------------------------------
|
||||||
Function:
|
Function:
|
||||||
Purpose:
|
Purpose:
|
||||||
|
|
|
@ -211,6 +211,7 @@ public:
|
||||||
// Speech interface
|
// Speech interface
|
||||||
static void playSpeech(SpeechEquate _speech);
|
static void playSpeech(SpeechEquate _speech);
|
||||||
static void stopSpeech();
|
static void stopSpeech();
|
||||||
|
static int isSpeechPlaying();
|
||||||
|
|
||||||
// Control
|
// Control
|
||||||
static void setVolume(VOLUMETYPE _type,int _val);
|
static void setVolume(VOLUMETYPE _type,int _val);
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue