diff options
| author | Oystein Eftevaag | 2006-05-28 06:07:54 +0000 |
|---|---|---|
| committer | Oystein Eftevaag | 2006-05-28 06:07:54 +0000 |
| commit | dbaf5206aeb2a958c4687577cddbdbffb016870a (patch) | |
| tree | feec2ce6bb0344a776fc8246f67eb15aaede6c02 /engines/kyra/script_v1.cpp | |
| parent | ea05e31330b336207cd2abc2d131cab049290126 (diff) | |
| download | scummvm-rg350-dbaf5206aeb2a958c4687577cddbdbffb016870a.tar.gz scummvm-rg350-dbaf5206aeb2a958c4687577cddbdbffb016870a.tar.bz2 scummvm-rg350-dbaf5206aeb2a958c4687577cddbdbffb016870a.zip | |
Added speechEnabled() and textEnabled() to simplify the text/speech config checks a bit, and added checks some more places
svn-id: r22703
Diffstat (limited to 'engines/kyra/script_v1.cpp')
| -rw-r--r-- | engines/kyra/script_v1.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/kyra/script_v1.cpp b/engines/kyra/script_v1.cpp index 946983d7c9..9ab89c28ea 100644 --- a/engines/kyra/script_v1.cpp +++ b/engines/kyra/script_v1.cpp @@ -45,11 +45,11 @@ int KyraEngine::cmd_characterSays(ScriptState *script) { _skipFlag = false; if (_features & GF_TALKIE) { debugC(3, kDebugLevelScriptFuncs, "cmd_characterSays(%p) (%d, '%s', %d, %d)", (const void *)script, stackPos(0), stackPosString(1), stackPos(2), stackPos(3)); - if (_configVoice == 1 || _configVoice == 2) { + if (speechEnabled()) { snd_voiceWaitForFinish(); snd_playVoiceFile(stackPos(0)); } - if (_configVoice == 0 || _configVoice == 2) + if (textEnabled()) characterSays(stackPosString(1), stackPos(2), stackPos(3)); } else { debugC(3, kDebugLevelScriptFuncs, "cmd_characterSays(%p) ('%s', %d, %d)", (const void *)script, stackPosString(0), stackPos(1), stackPos(2)); @@ -618,12 +618,12 @@ int KyraEngine::cmd_customPrintTalkString(ScriptState *script) { if (_features & GF_TALKIE) { debugC(3, kDebugLevelScriptFuncs, "cmd_customPrintTalkString(%p) (%d, '%s', %d, %d, %d)", (const void *)script, stackPos(0), stackPosString(1), stackPos(2), stackPos(3), stackPos(4) & 0xFF); - if (_configVoice == 1 || _configVoice == 2) { + if (speechEnabled()) { snd_voiceWaitForFinish(); snd_playVoiceFile(stackPos(0)); } _skipFlag = false; - if (_configVoice == 0 || _configVoice == 2) + if (textEnabled()) _text->printTalkTextMessage(stackPosString(1), stackPos(2), stackPos(3), stackPos(4) & 0xFF, 0, 2); } else { debugC(3, kDebugLevelScriptFuncs, "cmd_customPrintTalkString(%p) ('%s', %d, %d, %d)", (const void *)script, stackPosString(0), stackPos(1), stackPos(2), stackPos(3) & 0xFF); |