[Scummvm-git-logs] scummvm master -> 057cd171ed381094489e1d2ba9fc9b2f67a872ac

[sev-]

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

Summary:
238127f8e3 SCUMM HE: Added support for French Socks game
d7f82b83aa ASYLUM: Added override keywords
275cad9f78 LILLIPUT: Added missing reference to debug flags
057cd171ed ASYLUM: Fix warning


Commit: 238127f8e35b9af12acc0893286682e0d91c1549
    https://github.com/scummvm/scummvm/commit/238127f8e35b9af12acc0893286682e0d91c1549
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-06-07T00:28:23+02:00

Commit Message:
SCUMM HE: Added support for French Socks game

Changed paths:
    devtools/scumm-md5.txt
    engines/scumm/detection_tables.h
    engines/scumm/scumm-md5.h


diff --git a/devtools/scumm-md5.txt b/devtools/scumm-md5.txt
index e95eb60b4f..38e84fa5ea 100644
--- a/devtools/scumm-md5.txt
+++ b/devtools/scumm-md5.txt
@@ -761,6 +761,7 @@ socks	Pajama Sam's Sock Works
 	19263586f749a560c1adf8b3393a9593	-1	ru	Windows	HE 85	-	-	sev
 	4bfa4a43684bcb437f7fb47f457a0aa5	-1	nl	All	HE 99	-	-	daniel9
 	8de13897f0121c79d29a2377159f9ad0	-1	en	Windows	HE 99	Updated	-	Aziraphale Jasra
+	b2bc1df014ca9a563396cce691e9f23a	13668	fr	Windows	HE 99	-	-	sev
 
 puttrace	Putt-Putt Enters the Race
 	981e1e1891f2be7e25a01f50ae55a5af	-1	us	All	HE 98	-	-	Kirben
diff --git a/engines/scumm/detection_tables.h b/engines/scumm/detection_tables.h
index 437e4eb192..5cbc1a1fc8 100644
--- a/engines/scumm/detection_tables.h
+++ b/engines/scumm/detection_tables.h
@@ -842,6 +842,7 @@ static const GameFilenamePattern gameFilenamesTable[] = {
 	{ "socks", "SockWorks", kGenHEMac, UNK_LANG, Common::kPlatformMacintosh, 0 },
 	{ "socks", "SokkenSoep", kGenHEPC, Common::NL_NLD, Common::kPlatformWindows, 0 },
 	{ "socks", "SokkenSoep", kGenHEMac, Common::NL_NLD, Common::kPlatformMacintosh, 0 },
+	{ "socks", "Chaussettes", kGenHEPC, Common::FR_FRA, Common::kPlatformWindows, 0 },
 
 	{ "spyfox", "spyfox", kGenHEPC, UNK_LANG, Common::kPlatformWindows, 0 },
 	{ "spyfox", "Fuchsdem", kGenHEMac, Common::DE_DEU, Common::kPlatformMacintosh, 0 },
diff --git a/engines/scumm/scumm-md5.h b/engines/scumm/scumm-md5.h
index 44546d175d..a7edca47c6 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 May  7 09:01:43 2021
+  This file was generated by the md5table tool on Sun Jun  6 22:18:20 2021
   DO NOT EDIT MANUALLY!
  */
 
@@ -538,6 +538,7 @@ static const MD5Table md5table[] = {
 	{ "b23f7cd7c304d7dff08e92a96120d5b4", "zak", "V1", "V1", -1, Common::EN_ANY, Common::kPlatformDOS },
 	{ "b250d0f9cc83f80ced56fe11a4fb057c", "maniac", "V2", "V2", 1988, Common::EN_ANY, Common::kPlatformDOS },
 	{ "b289a2a8cbedbf45786e0b4ad2f510f1", "samnmax", "Floppy", "Floppy", -1, Common::IT_ITA, Common::kPlatformDOS },
+	{ "b2bc1df014ca9a563396cce691e9f23a", "socks", "HE 99", "", 13668, Common::FR_FRA, Common::kPlatformWindows },
 	{ "b47be81e39a9710f6f595f7b527b60f8", "puttrace", "HE 99", "", -1, Common::EN_GRB, Common::kPlatformWindows },
 	{ "b4a677bf27c010a747975705108ff1e6", "loom", "Steam", "Steam", 393572, Common::EN_ANY, Common::kPlatformMacintosh },
 	{ "b5298a5c15ffbe8b381d51ea4e26d35c", "freddi4", "HE 99", "", -1, Common::DE_DEU, Common::kPlatformUnknown },


Commit: d7f82b83aa80032b45fb80034cc892a8377cc3b2
    https://github.com/scummvm/scummvm/commit/d7f82b83aa80032b45fb80034cc892a8377cc3b2
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-06-07T00:28:23+02:00

Commit Message:
ASYLUM: Added override keywords

Changed paths:
    engines/asylum/detection.cpp


diff --git a/engines/asylum/detection.cpp b/engines/asylum/detection.cpp
index f8cab84d73..d40e89624e 100644
--- a/engines/asylum/detection.cpp
+++ b/engines/asylum/detection.cpp
@@ -52,19 +52,19 @@ public:
 		_directoryGlobs = Asylum::directoryGlobs;
 	}
 
-	ADDetectedGame fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const {
+	ADDetectedGame fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const override {
 		return detectGameFilebased(allFiles, Asylum::fileBasedFallback);
 	}
 
-	const char *getEngineId() const {
+	const char *getEngineId() const override {
 		return "asylum";
 	}
 
-	const char *getName() const {
+	const char *getName() const override {
 		return "Sanitarium";
 	}
 
-	const char *getOriginalCopyright() const {
+	const char *getOriginalCopyright() const override {
 		return "Sanitarium (c) ASC Games";
 	}
 


Commit: 275cad9f78311cc88383d22e410758f84bbd398e
    https://github.com/scummvm/scummvm/commit/275cad9f78311cc88383d22e410758f84bbd398e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-06-07T00:28:23+02:00

Commit Message:
LILLIPUT: Added missing reference to debug flags

Changed paths:
    engines/lilliput/detection.cpp


diff --git a/engines/lilliput/detection.cpp b/engines/lilliput/detection.cpp
index 76cd36df17..9e957bea86 100644
--- a/engines/lilliput/detection.cpp
+++ b/engines/lilliput/detection.cpp
@@ -118,6 +118,10 @@ public:
 	const char *getOriginalCopyright() const override {
 		return "Lilliput (C) S.L.Grand, Brainware, 1991-1992";
 	}
+
+	const DebugChannelDef *getDebugChannels() const override {
+		return debugFlagList;
+	}
 };
 
 } // End of namespace Lilliput


Commit: 057cd171ed381094489e1d2ba9fc9b2f67a872ac
    https://github.com/scummvm/scummvm/commit/057cd171ed381094489e1d2ba9fc9b2f67a872ac
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-06-07T00:28:23+02:00

Commit Message:
ASYLUM: Fix warning

Changed paths:
    engines/asylum/metaengine.cpp


diff --git a/engines/asylum/metaengine.cpp b/engines/asylum/metaengine.cpp
index f9c3f49fdb..aa63ea57c2 100644
--- a/engines/asylum/metaengine.cpp
+++ b/engines/asylum/metaengine.cpp
@@ -41,7 +41,7 @@ public:
 		return "Sanitarium (c) ASC Games";
 	}
 
-	bool hasFeature(MetaEngineFeature f) const;
+	bool hasFeature(MetaEngineFeature f) const override;
 	Common::Error createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const override;
 	Common::KeymapArray initKeymaps(const char *target) const override;
 };