diff options
| author | Travis Howell | 2005-11-27 05:24:35 +0000 |
|---|---|---|
| committer | Travis Howell | 2005-11-27 05:24:35 +0000 |
| commit | a1333d3fb9657c67d57c4f9b951a62b46e02cf02 (patch) | |
| tree | 26061c00a0f1bb217201a4ac03f5742c37101e9f /kyra | |
| parent | 9e7d76883d9ba0983f7efb15086578ca752b0b2c (diff) | |
| download | scummvm-rg350-a1333d3fb9657c67d57c4f9b951a62b46e02cf02.tar.gz scummvm-rg350-a1333d3fb9657c67d57c4f9b951a62b46e02cf02.tar.bz2 scummvm-rg350-a1333d3fb9657c67d57c4f9b951a62b46e02cf02.zip | |
Fix characters talking in CD version, stack order is different.
svn-id: r19714
Diffstat (limited to 'kyra')
| -rw-r--r-- | kyra/script_v1.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/kyra/script_v1.cpp b/kyra/script_v1.cpp index 13effe320f..865daa3ea3 100644 --- a/kyra/script_v1.cpp +++ b/kyra/script_v1.cpp @@ -304,7 +304,6 @@ int KyraEngine::cmd_magicInMouseItem(ScriptState *script) { } int KyraEngine::cmd_characterSays(ScriptState *script) { - debug(3, "cmd_characterSays(0x%X) ('%s', %d, %d)", script, stackPosString(0), stackPos(1), stackPos(2)); // Japanese version? /*const char *str1 = "âuâëâôââôüAé?é¢ùêé¢é+é®üH"; const char *str2 = "âuâëâôâ\\âôüAé?é¢ùêé¢é+é®üH"; @@ -312,7 +311,14 @@ int KyraEngine::cmd_characterSays(ScriptState *script) { if (strcmp(stackPosString(0), str1) == 0) characterSays((char *)str2, stackPos(1), stackPos(2)); else*/ - characterSays(stackPosString(0), stackPos(1), stackPos(2)); + + if (_features & GF_TALKIE) { + debug(3, "cmd_characterSays(0x%X) (%d, '%s', %d, %d)", script, stackPos(0), stackPosString(1), stackPos(2), stackPos(3)); + characterSays(stackPosString(1), stackPos(2), stackPos(3)); + } else { + debug(3, "cmd_characterSays(0x%X) ('%s', %d, %d)", script, stackPosString(0), stackPos(1), stackPos(2)); + characterSays(stackPosString(0), stackPos(1), stackPos(2)); + } return 0; } |