Merge branch 'master' into prince-lukaslw

4 files changed, 103 insertions, 3 deletions

diff --git a/engines/wintermute/base/font/base_font_truetype.cpp b/engines/wintermute/base/font/base_font_truetype.cpp
index c5a1e91ef5..df9a8648db 100644
--- a/engines/wintermute/base/font/base_font_truetype.cpp
+++ b/engines/wintermute/base/font/base_font_truetype.cpp
@@ -625,6 +625,8 @@ bool BaseFontTT::initFont() {
 		warning("Looking for %s", fontName.c_str());
 		_font = FontMan.getFontByName(fontName);
 	}
+#else
+	warning("BaseFontTT::InitFont - FreeType2-support not compiled in, TTF-fonts will not be loaded");
 #endif // USE_FREETYPE2
 
 	// Fallback4: Just use the Big GUI-font. (REALLY undesireable)
diff --git a/engines/wintermute/detection.cpp b/engines/wintermute/detection.cpp
index 48c75f634d..a659c434d0 100644
--- a/engines/wintermute/detection.cpp
+++ b/engines/wintermute/detection.cpp
@@ -107,11 +107,11 @@ public:
 					}
 				}
 				// Prefix to avoid collisions with actually known games
-				name = "wmefan-" + name;
+				name = "wmeunk-" + name;
 				Common::strlcpy(s_fallbackGameIdBuf, name.c_str(), sizeof(s_fallbackGameIdBuf) - 1);
 				s_fallbackDesc.gameid = s_fallbackGameIdBuf;
 				if (caption != name) {
-					caption += " (fangame) ";
+					caption += " (unknown version) ";
 					char *offset = s_fallbackGameIdBuf + name.size() + 1;
 					uint32 remainingLength = (sizeof(s_fallbackGameIdBuf) - 1) - (name.size() + 1);
 					Common::strlcpy(offset, caption.c_str(), remainingLength);
diff --git a/engines/wintermute/detection_tables.h b/engines/wintermute/detection_tables.h
index 0bf9fff4f3..6556d3b34a 100644
--- a/engines/wintermute/detection_tables.h
+++ b/engines/wintermute/detection_tables.h
@@ -38,6 +38,7 @@ static const PlainGameDescriptor wintermuteGames[] = {
 	{"carolreed8",      "Carol Reed 8 - Amber's Blood"},
 	{"carolreed9",      "Carol Reed 9 - Cold Case Summer"},
 	{"chivalry",        "Chivalry is Not Dead"},
+	{"corrosion",		"Corrosion: Cold Winter Waiting"},
 	{"deadcity",        "Dead City"},
 	{"dreaming",        "Des Reves Elastiques Avec Mille Insectes Nommes Georges"},
 	{"dirtysplit",      "Dirty Split"},
@@ -58,6 +59,8 @@ static const PlainGameDescriptor wintermuteGames[] = {
 	{"projectdoom",     "Project: Doom"},
 	{"reversion1",      "Reversion: The Escape"},
 	{"reversion2",      "Reversion: The Meeting"},
+	{"rhiannon",		"Rhiannon: Curse of the four Branches"},
+	{"ritter",			"1 1/2 Ritter: Auf der Suche nach der hinreissenden Herzelinde"},
 	{"rosemary",        "Rosemary"},
 	{"securanote",      "Securanote"},
 	{"shaban",          "Shaban"},
@@ -125,6 +128,16 @@ static const ADGameDescription gameDescriptions[] = {
 		ADGF_UNSTABLE,
 		GUIO0()
 	},
+	// Bickadoodle (download from http://aethericgames.com/games/bickadoodle/download-bickadoodle/)
+	{
+		"bickadoodle",
+		"",
+		AD_ENTRY1s("data.dcp", "1584d83577c32add0fce27fae91141a2", 35337728),
+		Common::EN_ANY,
+		Common::kPlatformWindows,
+		ADGF_UNSTABLE,
+		GUIO0()
+	},
 	// Book of Gron Part One
 	{
 		"bookofgron",
@@ -238,6 +251,16 @@ static const ADGameDescription gameDescriptions[] = {
 		ADGF_TESTING,
 		GUIO0()
 	},
+	// Corrosion: Cold Winter Waiting
+	{
+		"corrosion",
+		"",
+		AD_ENTRY1s("data.dcp", "ae885b1a8faa0b27f43c0e8f0df02fc9", 525931618),
+		Common::EN_ANY,
+		Common::kPlatformWindows,
+		ADGF_TESTING,
+		GUIO0()
+	},
 	// Dead City (Czech)
 	{
 		"deadcity",
@@ -429,7 +452,21 @@ static const ADGameDescription gameDescriptions[] = {
 		ADGF_UNSTABLE,
 		GUIO0()
 	},
-	// Ghosts in the Sheet
+	// Ghost in the Sheet
+	{
+		"ghostsheet",
+		"",
+		{
+			{"english.dcp", 0, "e6d0aad2c89996bcabe416105a3d6d3a", 12221017},
+			{"data.dcp", 0, "b2f8b05328e4881e15e98e845b63f451", 168003},
+			AD_LISTEND
+		},
+		Common::EN_ANY,
+		Common::kPlatformWindows,
+		ADGF_UNSTABLE,
+		GUIO0()
+	},
+	// Ghost in the Sheet (Demo)
 	{
 		"ghostsheet",
 		"Demo",
@@ -531,6 +568,16 @@ static const ADGameDescription gameDescriptions[] = {
 		ADGF_UNSTABLE,
 		GUIO0()
 	},
+	// J.U.L.I.A. (English, Bundle in a box-version)
+	{
+		"julia",
+		"Version 1.2",
+		AD_ENTRY1s("data.dcp", "fe90023ccc22f35185b40b910e0d03a2", 10101373),
+		Common::EN_ANY,
+		Common::kPlatformWindows,
+		ADGF_UNSTABLE,
+		GUIO0()
+	},
 	// J.U.L.I.A. (English) (Demo)
 	{
 		"julia",
@@ -997,6 +1044,56 @@ static const ADGameDescription gameDescriptions[] = {
 		ADGF_UNSTABLE,
 		GUIO0()
 	},
+	// Reversion: The Meeting Version 2.0.2412 (Chinese)
+	{
+		"reversion2",
+		"Version 2.0.2412",
+		{
+			{"data.dcp", 0, "f4ffc4df24b7bebad56a24930f33a2bc", 255766600},
+			{"xlanguage_nz.dcp", 0, "17c79af4928e24484bee77a7e807cc2a", 10737127},
+			{"Linux.dcp", 0, "21858bd77dc86b03f701fd47900e2f51", 984535},
+			AD_LISTEND
+		},
+		Common::ZH_CNA,
+		Common::kPlatformLinux,
+		ADGF_UNSTABLE,
+		GUIO0()
+	},
+	// Reversion: The Meeting Version 2.0.2412 (English)
+	{
+		"reversion2",
+		"Version 2.0.2412",
+		{
+			{"data.dcp", 0, "f4ffc4df24b7bebad56a24930f33a2bc", 255766600},
+			{"xlanguage_en.dcp", 0, "0598bf752ce93b42bcaf1094df537c7b", 8533057},
+			{"Linux.dcp", 0, "21858bd77dc86b03f701fd47900e2f51", 984535},
+			AD_LISTEND
+		},
+		Common::EN_ANY,
+		Common::kPlatformLinux,
+		ADGF_UNSTABLE,
+		GUIO0()
+	},
+	// Rhiannon: Curse of the four Branches
+	{
+		"rhiannon",
+		"",
+		AD_ENTRY1s("data.dcp", "870f348900b735f1cc79c0608ce32b0e", 1046169851),
+		Common::EN_ANY,
+		Common::kPlatformWindows,
+		ADGF_UNSTABLE,
+		GUIO0()
+	},
+	// 1 1/2 Ritter: Auf der Suche nach der hinreissenden Herzelinde
+	{
+		"ritter",
+		"",
+		AD_ENTRY1s("data.dcp", "5ac416cee605d3a30f4d59687b1cdab2", 364260278),
+		Common::DE_DEU,
+		Common::kPlatformWindows,
+		ADGF_UNSTABLE,
+		GUIO0()
+	},
 	// Rosemary
 	{
 		"rosemary",
diff --git a/engines/wintermute/video/video_theora_player.cpp b/engines/wintermute/video/video_theora_player.cpp
index b0c469c440..e1553580ec 100644
--- a/engines/wintermute/video/video_theora_player.cpp
+++ b/engines/wintermute/video/video_theora_player.cpp
@@ -127,6 +127,7 @@ bool VideoTheoraPlayer::initialize(const Common::String &filename, const Common:
 #if defined (USE_THEORADEC)
 	_theoraDecoder = new Video::TheoraDecoder();
 #else
+	warning("VideoTheoraPlayer::initialize - Theora support not compiled in, video will be skipped: %s", filename.c_str());
 	return STATUS_FAILED;
 #endif
 	_theoraDecoder->loadStream(_file);