[Scummvm-cvs-logs] SF.net SVN: scummvm:[47693] scummvm/trunk/engines/sci/engine/kernel32.cpp

[thebluegr at users.sourceforge.net]

Revision: 47693
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47693&view=rev
Author:   thebluegr
Date:     2010-01-30 01:14:25 +0000 (Sat, 30 Jan 2010)

Log Message:
-----------
Ignore kString(printBuf) calls with more parameters than 3 - a list is probably used

Modified Paths:
--------------
    scummvm/trunk/engines/sci/engine/kernel32.cpp

Modified: scummvm/trunk/engines/sci/engine/kernel32.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/kernel32.cpp	2010-01-30 01:02:29 UTC (rev 47692)
+++ scummvm/trunk/engines/sci/engine/kernel32.cpp	2010-01-30 01:14:25 UTC (rev 47693)
@@ -617,7 +617,14 @@
 		warning("kString(Printf)");
 		break;
 	case 12: // Printf Buf
-		return kFormat(s, argc - 1, argv + 1);
+		if (argc == 3)
+			return kFormat(s, argc - 1, argv + 1);
+		else
+			// TODO
+			// For some reason, argc > 3 crashes, e.g. in Torin full (there's a format
+			// string %s%s, but the string passed for the first %s is invalid). Perhaps
+			// a list is passed in this case?
+			warning("kString(PrintBuf) - parameter count %d not supported", argc);
 		break;
 	case 13: { // atoi
 		Common::String string = s->_segMan->getString(argv[1]);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.