From 2c760cb15e27de29ef9262cb6e2a102d8dbe3935 Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Wed, 27 Jun 2012 04:42:36 +0200
Subject: DETECTOR: Make detectGameFilebased() return a list of MD5s and file
 sizes

Since we need a FSNode parent for Mac resource forks, we need to change
signature of detectGameFilebased(), too.
---
 engines/touche/detection.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/touche')

diff --git a/engines/touche/detection.cpp b/engines/touche/detection.cpp
index 35dd54776f..2566597e6c 100644
--- a/engines/touche/detection.cpp
+++ b/engines/touche/detection.cpp
@@ -135,7 +135,7 @@ public:
 	}
 
 	virtual const ADGameDescription *fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const {
-		const ADGameDescription *matchedDesc = detectGameFilebased(allFiles, Touche::fileBasedFallback);
+		const ADGameDescription *matchedDesc = detectGameFilebased(allFiles, fslist, Touche::fileBasedFallback);
 
 		if (matchedDesc) { // We got a match
 			Common::String report = Common::String::format(_("Your game version has been detected using "
-- 
cgit v1.2.3


From 18fc453b97e4b67e5e4bd6522c8b8dd05d289910 Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Wed, 27 Jun 2012 04:56:19 +0200
Subject: TOUCHE: Report unknown game variant when using the file based
 fallback detector

Given the message Touche prints when it found a game, printing the
MD5 sums of the files was probably what it expected the
AdvancedDetector would do in the filebase fallback detector. This may
have been true in the past, but it's not what it does anymore,
rendering the message pointless.
This fixes it by calling the now accessable reportUnknown method.
---
 engines/touche/detection.cpp | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

(limited to 'engines/touche')

diff --git a/engines/touche/detection.cpp b/engines/touche/detection.cpp
index 2566597e6c..e4bbe0c4c1 100644
--- a/engines/touche/detection.cpp
+++ b/engines/touche/detection.cpp
@@ -135,19 +135,13 @@ public:
 	}
 
 	virtual const ADGameDescription *fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const {
-		const ADGameDescription *matchedDesc = detectGameFilebased(allFiles, fslist, Touche::fileBasedFallback);
-
-		if (matchedDesc) { // We got a match
-			Common::String report = Common::String::format(_("Your game version has been detected using "
-				"filename matching as a variant of %s."), matchedDesc->gameid);
-			report += "\n";
-			report += _("If this is an original and unmodified version, please report any");
-			report += "\n";
-			report += _("information previously printed by ScummVM to the team.");
-			report += "\n";
-			g_system->logMessage(LogMessageType::kInfo, report.c_str());
-		}
+		ADFilePropertiesMap filesProps;
+
+		const ADGameDescription *matchedDesc = detectGameFilebased(allFiles, fslist, Touche::fileBasedFallback, &filesProps);
+		if (!matchedDesc)
+			return 0;
 
+		reportUnknown(fslist.begin()->getParent(), filesProps);
 		return matchedDesc;
 	}
 
-- 
cgit v1.2.3


From c18cacc248c062ae3ef3697a516ce135deb4ad14 Mon Sep 17 00:00:00 2001
From: Willem Jan Palenstijn
Date: Tue, 25 Sep 2012 19:36:47 +0200
Subject: TOUCHE: Add more font entries to French Touche

The nbsp at position 255 (assuming CP863) was missing (bug #3571138).
---
 engines/touche/staticres.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'engines/touche')

diff --git a/engines/touche/staticres.cpp b/engines/touche/staticres.cpp
index c18a947358..23b76558e4 100644
--- a/engines/touche/staticres.cpp
+++ b/engines/touche/staticres.cpp
@@ -471,7 +471,10 @@ const uint16 Graphics::_freGerFontOffs[] = {
 	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
 	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
 	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
-	0x0000, 0x0000, 0x0000, 0x1920
+	0x0000, 0x0000, 0x0000, 0x1920, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+	0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000, 0x0000,
+	0x0000, 0x0000, 0x0000, 0x0000
 };
 
 const int Graphics::_freGerFontSize = ARRAYSIZE(Graphics::_freGerFontOffs);
-- 
cgit v1.2.3