aboutsummaryrefslogtreecommitdiff
path: root/kyra
diff options
context:
space:
mode:
authorTravis Howell2005-11-27 05:49:35 +0000
committerTravis Howell2005-11-27 05:49:35 +0000
commit5a62f79bd0c47347082007540cff7aacbd4875dc (patch)
tree6da7deb979b2d7cfbafdbcc9b3e1f6147529f738 /kyra
parenta1333d3fb9657c67d57c4f9b951a62b46e02cf02 (diff)
downloadscummvm-rg350-5a62f79bd0c47347082007540cff7aacbd4875dc.tar.gz
scummvm-rg350-5a62f79bd0c47347082007540cff7aacbd4875dc.tar.bz2
scummvm-rg350-5a62f79bd0c47347082007540cff7aacbd4875dc.zip
More string fixes for CD version, due to stack order differences.
svn-id: r19715
Diffstat (limited to 'kyra')
-rw-r--r--kyra/script_v1.cpp20
1 files changed, 16 insertions, 4 deletions
diff --git a/kyra/script_v1.cpp b/kyra/script_v1.cpp
index 865daa3ea3..5b26cc5e1e 100644
--- a/kyra/script_v1.cpp
+++ b/kyra/script_v1.cpp
@@ -771,8 +771,14 @@ int KyraEngine::cmd_loadPageFromDisk(ScriptState *script) {
}
int KyraEngine::cmd_customPrintTalkString(ScriptState *script) {
- debug(3, "cmd_customPrintTalkString(0x%X) ('%s', %d, %d, %d)", script, stackPosString(0), stackPos(1), stackPos(2), stackPos(3) & 0xFF);
- printTalkTextMessage(stackPosString(0), stackPos(1), stackPos(2), stackPos(3) & 0xFF, 0, 2);
+ if (_features & GF_TALKIE) {
+ debug(3, "cmd_customPrintTalkString(0x%X) ('%s', %d, %d, %d)", script, stackPosString(1), stackPos(2), stackPos(3), stackPos(4) & 0xFF);
+ printTalkTextMessage(stackPosString(1), stackPos(2), stackPos(3), stackPos(4) & 0xFF, 0, 2);
+ } else {
+ debug(3, "cmd_customPrintTalkString(0x%X) ('%s', %d, %d, %d)", script, stackPosString(0), stackPos(1), stackPos(2), stackPos(3) & 0xFF);
+ printTalkTextMessage(stackPosString(0), stackPos(1), stackPos(2), stackPos(3) & 0xFF, 0, 2);
+ }
+
return 0;
}
@@ -1421,8 +1427,14 @@ int KyraEngine::cmd_setScaleDepthTableValue(ScriptState *script) {
}
int KyraEngine::cmd_message(ScriptState *script) {
- debug(9, "cmd_message(0x%X)", script);
- drawSentenceCommand(stackPosString(0), stackPos(1));
+ if (_features & GF_TALKIE) {
+ debug(9, "cmd_message(0x%X)", script);
+ drawSentenceCommand(stackPosString(1), stackPos(2));
+ } else {
+ debug(9, "cmd_message(0x%X)", script);
+ drawSentenceCommand(stackPosString(0), stackPos(1));
+ }
+
return 0;
}