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

[kirben]

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

Modified Files:
	script_v1.cpp 
Log Message:

Fix characters talking in CD version, stack order is different.


Index: script_v1.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/kyra/script_v1.cpp,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- script_v1.cpp	27 Nov 2005 00:12:07 -0000	1.26
+++ script_v1.cpp	27 Nov 2005 05:24:35 -0000	1.27
@@ -304,7 +304,6 @@
 }
 
 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 @@
 	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;
 }