libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-18 23:57:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

TSAGE: Fixes for calling voice playback correctly when showing on-screen text

Browse Source
This commit is contained in:
Paul Gilbert 2013-10-16 23:01:26 -04:00
parent 7d7c0966a2
commit eb7f7b9fb6
1 changed files with 27 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
engines/tsage/core.cpp
View File

@ -1749,9 +1749,22 @@ void SceneItem::display(int resNum, int lineNum, ...) {
}
g_globals->_sceneText.fixPriority(255);
// In Return to Ringworld, if in voice mode only, don't show the text
if ((g_vm->getGameID() == GType_Ringworld2) && (R2_GLOBALS._speechSubtitles & SPEECH_VOICE)
&& !(R2_GLOBALS._speechSubtitles & SPEECH_TEXT))
g_globals->_sceneText.hide();
g_globals->_sceneObjects->draw();
}
// For Return to Ringworld, play the voice overs in sequence
if ((g_vm->getGameID() == GType_Ringworld2) && (R2_GLOBALS._speechSubtitles & SPEECH_VOICE)
&& !playList.empty()) {
R2_GLOBALS._playStream.play(*playList.begin(), NULL);
playList.pop_front();
}
// Unless the flag is set to keep the message on-screen, show it until a mouse or keypress, then remove it
if (!keepOnscreen && !msg.empty()) {
Event event;
@ -1761,13 +1774,22 @@ void SceneItem::display(int resNum, int lineNum, ...) {
EVENT_BUTTON_DOWN | EVENT_KEYPRESS)) {
GLOBALS._screenSurface.updateScreen();
g_system->delayMillis(10);
if ((g_vm->getGameID() == GType_Ringworld2) && (R2_GLOBALS._speechSubtitles & SPEECH_VOICE)) {
// Allow the play stream to do processing
R2_GLOBALS._playStream.dispatch();
if (!R2_GLOBALS._playStream.isPlaying()) {
// Check if there are further voice samples to play
if (!playList.empty()) {
R2_GLOBALS._playStream.play(*playList.begin(), NULL);
playList.pop_front();
}
}
}
}
// For Return to Ringworld, play the voice overs in sequence
if ((g_vm->getGameID() == GType_Ringworld2) && !playList.empty() && !R2_GLOBALS._playStream.isPlaying()) {
R2_GLOBALS._playStream.play(*playList.begin(), NULL);
playList.pop_front();
}
if (g_vm->getGameID() == GType_Ringworld2)
R2_GLOBALS._playStream.stop();
g_globals->_sceneText.remove();
}