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

[thebluegr at users.sourceforge.net]

Revision: 44982
          http://scummvm.svn.sourceforge.net/scummvm/?rev=44982&view=rev
Author:   thebluegr
Date:     2009-10-12 12:03:06 +0000 (Mon, 12 Oct 2009)

Log Message:
-----------
Reverted the Common::String::printf() related commits, as the function works fine now under MSVC

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

Modified: scummvm/trunk/engines/sci/engine/vm.cpp
===================================================================
--- scummvm/trunk/engines/sci/engine/vm.cpp	2009-10-12 12:01:07 UTC (rev 44981)
+++ scummvm/trunk/engines/sci/engine/vm.cpp	2009-10-12 12:03:06 UTC (rev 44982)
@@ -110,8 +110,9 @@
 	const char *names[4] = {"global", "local", "temp", "param"};
 
 	if (index < 0 || index >= max) {
-		Common::String txt = "[VM] Attempt to use invalid " + 
-							Common::String::printf("%s variable %04x ", names[type], index);
+		Common::String txt = Common::String::printf(
+							"[VM] Attempt to use invalid %s variable %04x ", 
+							names[type], index);
 		if (max == 0)
 			txt += "(variable type invalid)";
 		else
@@ -940,11 +941,10 @@
 						// Remove callk stack frame again
 						s->_executionStack.pop_back();
 					} else {
-						Common::String warningMsg = "Dummy function " + kfun.orig_name;
-						warningMsg += Common::String::printf("[0x%x]", opparams[0]);
-						warningMsg += " invoked - ignoring. Params: ";
-						warningMsg += Common::String::printf("%d", argc);
-						warningMsg += " (";
+						Common::String warningMsg = "Dummy function " + kfun.orig_name + 
+													Common::String::printf("[0x%x]", opparams[0]) +
+													" invoked - ignoring. Params: " + 
+													Common::String::printf("%d", argc) + " (";
 
 						for (int i = 0; i < argc; i++) {
 							warningMsg +=  Common::String::printf("%04x:%04x", PRINT_REG(argv[i]));


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