[Scummvm-cvs-logs] CVS: scummvm/kyra script_v1.cpp,1.27,1.28

[kirben]

Update of /cvsroot/scummvm/scummvm/kyra
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21586/kyra

Modified Files:
	script_v1.cpp 
Log Message:

More string fixes for CD version, due to stack order differences.


Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/script_v1.cpp,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- script_v1.cpp	27 Nov 2005 05:24:35 -0000	1.27
+++ script_v1.cpp	27 Nov 2005 05:49:35 -0000	1.28
@@ -771,8 +771,14 @@
 }
 
 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_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;
 }