[Scummvm-cvs-logs] scummvm master -> 067db748e446fb456584d53bc8e206fadbbac9de

[fuzzie]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
92bcb1801a SCUMM: Replace detector printf usage with logMessage.
067db748e4 AGI: Replace detector printf usage with logMessage.


Commit: 92bcb1801a3d25af9f822d901cbd6613ecdff365
    https://github.com/scummvm/scummvm/commit/92bcb1801a3d25af9f822d901cbd6613ecdff365
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2012-08-15T00:48:50-07:00

Commit Message:
SCUMM: Replace detector printf usage with logMessage.

Changed paths:
    engines/scumm/detection.cpp



diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp
index 8730592..5404c7f 100644
--- a/engines/scumm/detection.cpp
+++ b/engines/scumm/detection.cpp
@@ -20,9 +20,6 @@
  *
  */
 
-// FIXME: Avoid using printf
-#define FORBIDDEN_SYMBOL_EXCEPTION_printf
-
 #include "base/plugins.h"
 
 #include "common/archive.h"
@@ -1066,15 +1063,19 @@ Common::Error ScummMetaEngine::createInstance(OSystem *syst, Engine **engine) co
 	// unknown MD5, or with a medium debug level in case of a known MD5 (for
 	// debugging purposes).
 	if (!findInMD5Table(res.md5.c_str())) {
-		printf("Your game version appears to be unknown. If this is *NOT* a fan-modified\n");
-		printf("version (in particular, not a fan-made translation), please, report the\n");
-		printf("following data to the ScummVM team along with name of the game you tried\n");
-		printf("to add and its version/language/etc.:\n");
+		Common::String md5Warning;
+
+		md5Warning = "Your game version appears to be unknown. If this is *NOT* a fan-modified\n";
+		md5Warning += "version (in particular, not a fan-made translation), please, report the\n";
+		md5Warning += "following data to the ScummVM team along with name of the game you tried\n";
+		md5Warning += "to add and its version/language/etc.:\n";
 
-		printf("  SCUMM gameid '%s', file '%s', MD5 '%s'\n\n",
+		md5Warning += Common::String::format("  SCUMM gameid '%s', file '%s', MD5 '%s'\n\n",
 				res.game.gameid,
 				generateFilenameForDetection(res.fp.pattern, res.fp.genMethod).c_str(),
 				res.md5.c_str());
+
+		g_system->logMessage(LogMessageType::kWarning, md5Warning.c_str());
 	} else {
 		debug(1, "Using MD5 '%s'", res.md5.c_str());
 	}


Commit: 067db748e446fb456584d53bc8e206fadbbac9de
    https://github.com/scummvm/scummvm/commit/067db748e446fb456584d53bc8e206fadbbac9de
Author: Alyssa Milburn (fuzzie at fuzzie.org)
Date: 2012-08-15T00:51:55-07:00

Commit Message:
AGI: Replace detector printf usage with logMessage.

Changed paths:
    engines/agi/detection.cpp



diff --git a/engines/agi/detection.cpp b/engines/agi/detection.cpp
index 805fe7d..5f7780b 100644
--- a/engines/agi/detection.cpp
+++ b/engines/agi/detection.cpp
@@ -20,9 +20,6 @@
  *
  */
 
-// FIXME: Avoid using printf
-#define FORBIDDEN_SYMBOL_EXCEPTION_printf
-
 #include "base/plugins.h"
 
 #include "engines/advancedDetector.h"
@@ -491,10 +488,14 @@ const ADGameDescription *AgiMetaEngine::fallbackDetect(const FileMap &allFilesXX
 		g_fallbackDesc.desc.gameid = _gameid.c_str();
 		g_fallbackDesc.desc.extra = _extra.c_str();
 
-		printf("Your game version has been detected using fallback matching as a\n");
-		printf("variant of %s (%s).\n", g_fallbackDesc.desc.gameid, g_fallbackDesc.desc.extra);
-		printf("If this is an original and unmodified version or new made Fanmade game,\n");
-		printf("please report any, information previously printed by ScummVM to the team.\n");
+		Common::String fallbackWarning;
+
+		fallbackWarning = "Your game version has been detected using fallback matching as a\n";
+		fallbackWarning += Common::String::format("variant of %s (%s).\n", g_fallbackDesc.desc.gameid, g_fallbackDesc.desc.extra);
+		fallbackWarning += "If this is an original and unmodified version or new made Fanmade game,\n";
+		fallbackWarning += "please report any, information previously printed by ScummVM to the team.\n";
+
+		g_system->logMessage(LogMessageType::kWarning, fallbackWarning.c_str());
 
 		return (const ADGameDescription *)&g_fallbackDesc;
 	}