Merge remote branch 'upstream/master' into pegasus

Conflicts:
	AUTHORS
	devtools/credits.pl
	gui/credits.h

3 files changed, 17 insertions, 11 deletions

diff --git a/engines/scumm/detection.cpp b/engines/scumm/detection.cpp
index ebf1a2675c..5404c7f8b1 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());
 	}
@@ -1266,7 +1267,6 @@ SaveStateDescriptor ScummMetaEngine::querySaveMetaInfos(const char *target, int
 	Graphics::Surface *thumbnail = ScummEngine::loadThumbnailFromSlot(target, slot);
 
 	SaveStateDescriptor desc(slot, saveDesc);
-	desc.setDeletableFlag(true);
 	desc.setThumbnail(thumbnail);
 
 	SaveStateMetaInfos infos;
diff --git a/engines/scumm/he/animation_he.cpp b/engines/scumm/he/animation_he.cpp
index 40e99c26a8..be17a3b305 100644
--- a/engines/scumm/he/animation_he.cpp
+++ b/engines/scumm/he/animation_he.cpp
@@ -40,7 +40,7 @@ MoviePlayer::MoviePlayer(ScummEngine_v90he *vm, Audio::Mixer *mixer) : _vm(vm) {
 		_video = new Video::BinkDecoder();
 	else
 #endif
-		_video = new Video::SmackerDecoder(mixer);
+		_video = new Video::SmackerDecoder();
 
 	_flags = 0;
 	_wizResNum = 0;
@@ -61,11 +61,16 @@ int MoviePlayer::load(const char *filename, int flags, int image) {
 	if (_video->isVideoLoaded())
 		_video->close();
 
+	// Ensure that Bink will use our PixelFormat
+	_video->setDefaultHighColorFormat(g_system->getScreenFormat());
+
 	if (!_video->loadFile(filename)) {
 		warning("Failed to load video file %s", filename);
 		return -1;
 	}
 
+	_video->start();
+
 	debug(1, "Playing video %s", filename);
 
 	if (flags & 2)
diff --git a/engines/scumm/scumm-md5.h b/engines/scumm/scumm-md5.h
index 0814e3bfe1..d4eefe8c28 100644
--- a/engines/scumm/scumm-md5.h
+++ b/engines/scumm/scumm-md5.h
@@ -1,5 +1,5 @@
 /*
-  This file was generated by the md5table tool on Fri Jun 15 09:16:45 2012
+  This file was generated by the md5table tool on Sat Jul 07 23:39:27 2012
   DO NOT EDIT MANUALLY!
  */
 
@@ -191,6 +191,7 @@ static const MD5Table md5table[] = {
 	{ "45082a5c9f42ba14dacfe1fdeeba819d", "freddicove", "HE 100", "Demo", 18422, Common::EN_ANY, Common::kPlatformUnknown },
 	{ "45152f7cf2ba8f43cf8a8ea2e740ae09", "monkey", "VGA", "VGA", 8357, Common::ES_ESP, Common::kPlatformPC },
 	{ "4521138d15d1fd7649c31fb981746231", "pajama2", "HE 98.5", "Demo", -1, Common::DE_DEU, Common::kPlatformUnknown },
+	{ "4522564b3c31aaf218b6a96826a549fd", "maze", "HE 99", "", -1, Common::EN_USA, Common::kPlatformWindows },
 	{ "46b53fd430adcfbed791b48a0d4b079f", "funpack", "", "", -1, Common::EN_ANY, Common::kPlatformPC },
 	{ "470c45b636139bb40716daa1c7edaad0", "loom", "EGA", "EGA", -1, Common::DE_DEU, Common::kPlatformPC },
 	{ "477dbafbd66a53c98416dc01aef019ad", "monkey", "EGA", "EGA", -1, Common::IT_ITA, Common::kPlatformPC },