thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix for bug #Fix for bug #1523200 ("KYRA1: Voice-only mode has no lips animation").

Browse source 
svn-id: r25313
This commit is contained in:
Johannes Schickel 2007-01-31 18:35:50 +00:00
parent 9799b346d8
commit d82c67b48c
6 changed files with 79 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

11
engines/kyra/script_v1.cpp
View file

@ -45,15 +45,10 @@ int KyraEngine::o1_characterSays(ScriptState *script) {
_skipFlag = false;
if (_flags.isTalkie) {
debugC(3, kDebugLevelScriptFuncs, "o1_characterSays(%p) (%d, '%s', %d, %d)", (const void *)script, stackPos(0), stackPosString(1), stackPos(2), stackPos(3));
if (speechEnabled()) {
snd_voiceWaitForFinish();
snd_playVoiceFile(stackPos(0));
}
if (textEnabled())
characterSays(stackPosString(1), stackPos(2), stackPos(3));
characterSays(stackPos(0), stackPosString(1), stackPos(2), stackPos(3));
} else {
debugC(3, kDebugLevelScriptFuncs, "o1_characterSays(%p) ('%s', %d, %d)", (const void *)script, stackPosString(0), stackPos(1), stackPos(2));
characterSays(stackPosString(0), stackPos(1), stackPos(2));
characterSays(-1, stackPosString(0), stackPos(1), stackPos(2));
}
return 0;
@ -644,6 +639,8 @@ int KyraEngine::o1_customPrintTalkString(ScriptState *script) {
int KyraEngine::o1_restoreCustomPrintBackground(ScriptState *script) {
debugC(3, kDebugLevelScriptFuncs, "o1_restoreCustomPrintBackground(%p) ()", (const void *)script);
snd_voiceWaitForFinish();
snd_stopVoice();
_text->restoreTalkTextMessageBkgd(2, 0);
return 0;
}