This commit is contained in:
parent
973d12c1e9
commit
4a58e310b8
4 changed files with 24 additions and 0 deletions
|
@ -1573,6 +1573,7 @@ void CFmaScene::selectFma(FMA_SCRIPT_NUMBER _fma)
|
||||||
---------------------------------------------------------------------- */
|
---------------------------------------------------------------------- */
|
||||||
void CFmaScene::startShutdown()
|
void CFmaScene::startShutdown()
|
||||||
{
|
{
|
||||||
|
CSoundMediator::stopSpeech();
|
||||||
CFader::setFadingOut();
|
CFader::setFadingOut();
|
||||||
m_readyToShutdown=true;
|
m_readyToShutdown=true;
|
||||||
}
|
}
|
||||||
|
|
|
@ -496,6 +496,15 @@ void CConversation::setCharacterAndText(int _characterId,int _textId)
|
||||||
s_maxTextPageOffset=i/TEXTBOX_FONT_NUM_LINES_IN_BOX;
|
s_maxTextPageOffset=i/TEXTBOX_FONT_NUM_LINES_IN_BOX;
|
||||||
s_textPageOffset=0;
|
s_textPageOffset=0;
|
||||||
|
|
||||||
|
for (int i=0; i<SpeechTableSize; i++)
|
||||||
|
{
|
||||||
|
if (SpeechTable[i].TextID==_textId)
|
||||||
|
{
|
||||||
|
CSoundMediator::playSpeech((SpeechEquate)SpeechTable[i].SpeechID);
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
PAUL_DBGMSG("calced height=%d",s_maxTextPageOffset);
|
PAUL_DBGMSG("calced height=%d",s_maxTextPageOffset);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -248,6 +248,13 @@ void CPauseMenu::select()
|
||||||
|
|
||||||
chapter=GameScene.getChapterNumber()-1;
|
chapter=GameScene.getChapterNumber()-1;
|
||||||
level=GameScene.getLevelNumber()-1;
|
level=GameScene.getLevelNumber()-1;
|
||||||
|
m_SpeechPlaying=false;
|
||||||
|
if (CXAStream::IsPlaying())
|
||||||
|
{
|
||||||
|
m_SpeechPlaying=true;
|
||||||
|
CXAStream::Pause();
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -260,6 +267,12 @@ void CPauseMenu::select()
|
||||||
void CPauseMenu::unselect()
|
void CPauseMenu::unselect()
|
||||||
{
|
{
|
||||||
m_active=false;
|
m_active=false;
|
||||||
|
if (m_SpeechPlaying)
|
||||||
|
{
|
||||||
|
CXAStream::Resume();
|
||||||
|
m_SpeechPlaying=false;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
/*----------------------------------------------------------------------
|
/*----------------------------------------------------------------------
|
||||||
Function:
|
Function:
|
||||||
|
|
|
@ -64,6 +64,7 @@ private:
|
||||||
|
|
||||||
|
|
||||||
int m_active;
|
int m_active;
|
||||||
|
int m_SpeechPlaying;
|
||||||
int m_padDebounce;
|
int m_padDebounce;
|
||||||
int m_responseFlag;
|
int m_responseFlag;
|
||||||
STATE m_currentState;
|
STATE m_currentState;
|
||||||
|
|
Loading…
Add table
Reference in a new issue