[Scummvm-git-logs] scummvm master -> c9cf81874a4802726673e4b084bdbe6ea98baab1

[sev-]

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

Summary:
bd3e2f8e6b DIRECTOR: Added more tail md5 macros and switched one game to tail md5
63870b65fa AD: Properly seek to the tail of file for md5 computation
c9cf81874a SCUMM: Added override keywords


Commit: bd3e2f8e6bdfbc36dd588e853db06d369c77081c
    https://github.com/scummvm/scummvm/commit/bd3e2f8e6bdfbc36dd588e853db06d369c77081c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-10-19T21:09:15+03:00

Commit Message:
DIRECTOR: Added more tail md5 macros and switched one game to tail md5

Changed paths:
    engines/director/detection_tables.h


diff --git a/engines/director/detection_tables.h b/engines/director/detection_tables.h
index c75408a090..07be39a9ec 100644
--- a/engines/director/detection_tables.h
+++ b/engines/director/detection_tables.h
@@ -1193,10 +1193,13 @@ namespace Director {
 #define MACGAME1t(t,e,f,m,s,v) 	GENGAME1t_(t,e,f,m,s,Common::EN_ANY,Common::kPlatformMacintosh,ADGF_MACRESFORK,v)
 #define PIPGAME1(t,e,f,m,s,v) 	GENGAME1_(t,e,f,m,s,Common::EN_ANY,Common::kPlatformPippin,ADGF_MACRESFORK,v)
 #define WINGAME1(t,e,f,m,s,v) 	GENGAME1_(t,e,f,m,s,Common::EN_ANY,Common::kPlatformWindows,ADGF_NO_FLAGS,v)
+#define WINGAME1t(t,e,f,m,s,v) 	GENGAME1t_(t,e,f,m,s,Common::EN_ANY,Common::kPlatformWindows,ADGF_NO_FLAGS,v)
 #define FMTGAME1(t,e,f,m,s,v) 	GENGAME1_(t,e,f,m,s,Common::EN_ANY,Common::kPlatformFMTowns,ADGF_NO_FLAGS,v)
 #define SHKGAME1(t,e,f,m,s,v) 	GENGAME1_(t,e,f,m,s,Common::EN_ANY,Common::kPlatformShockwave,ADGF_NO_FLAGS,v)
 #define MACDEMO1(t,e,f,m,s,v) 	GENGAME1_(t,e,f,m,s,Common::EN_ANY,Common::kPlatformMacintosh,(ADGF_MACRESFORK|ADGF_DEMO),v)
+#define MACDEMO1t(t,e,f,m,s,v) 	GENGAME1t_(t,e,f,m,s,Common::EN_ANY,Common::kPlatformMacintosh,(ADGF_MACRESFORK|ADGF_DEMO),v)
 #define WINDEMO1(t,e,f,m,s,v) 	GENGAME1_(t,e,f,m,s,Common::EN_ANY,Common::kPlatformWindows,ADGF_DEMO,v)
+#define WINDEMO1t(t,e,f,m,s,v) 	GENGAME1t_(t,e,f,m,s,Common::EN_ANY,Common::kPlatformWindows,ADGF_DEMO,v)
 #define MACGAME1_l(t,e,f,m,s,l,v) GENGAME1_(t,e,f,m,s,l,Common::kPlatformMacintosh,ADGF_MACRESFORK,v)
 #define PIPGAME1_l(t,e,f,m,s,l,v) GENGAME1_(t,e,f,m,s,l,Common::kPlatformPippin,ADGF_MACRESFORK,v)
 #define WINGAME1_l(t,e,f,m,s,l,v) GENGAME1_(t,e,f,m,s,l,Common::kPlatformWindows,ADGF_NO_FLAGS,v)
@@ -1755,7 +1758,7 @@ static const DirectorGameDescription gameDescriptions[] = {
 	MACDEMO1_l("moderntimes", "Demo", "ModernTimes", "f5277c53bacd27936158dd3867e587e2", 391613, Common::JA_JPN, 311),
 
 	// Demos from The Computer Buyer Collection Volume 1 - Sep 1995
-	WINDEMO1("msarcade",	   "Demo",		"ARCADE.EXE",   "2b3543a9131a49f665982d26513a84f8", 1843614, 310),
+	WINDEMO1t("msarcade",	   "Demo",		"ARCADE.EXE",   "a7f83e35541a2952cd4848becee98c1d", 1843614, 310),
 	WINDEMO1("msartgallery",   "Demo",		"ARTGDEMO.EXE", "2b3543a9131a49f665982d26513a84f8", 370002, 310),
 	WINDEMO1("msbaseball",	   "1994 Demo",	"BASEBALL.EXE", "2b3543a9131a49f665982d26513a84f8", 370013, 310),
 	WINDEMO1("msbasketball",   "1994 Demo",	"BASKET.EXE",   "2b3543a9131a49f665982d26513a84f8", 370014, 310),


Commit: 63870b65fadece8c4dc41a364a240e5c9b039585
    https://github.com/scummvm/scummvm/commit/63870b65fadece8c4dc41a364a240e5c9b039585
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-10-19T21:09:15+03:00

Commit Message:
AD: Properly seek to the tail of file for md5 computation

Changed paths:
    common/macresman.cpp
    engines/advancedDetector.cpp


diff --git a/common/macresman.cpp b/common/macresman.cpp
index 4f952fd6a2..cf903c84bd 100644
--- a/common/macresman.cpp
+++ b/common/macresman.cpp
@@ -114,7 +114,7 @@ String MacResManager::computeResForkMD5AsString(uint32 length, bool tail) const
 
 	SeekableSubReadStream resForkStream(_stream, dataOffset, dataOffset + dataLength);
 	if (tail && dataLength > length)
-		resForkStream.seek(-length, SEEK_END);
+		resForkStream.seek(-(int64)length, SEEK_END);
 
 	return computeStreamMD5AsString(resForkStream, MIN<uint32>(length, _resForkSize));
 }
diff --git a/engines/advancedDetector.cpp b/engines/advancedDetector.cpp
index 7b53d40a33..d41875f641 100644
--- a/engines/advancedDetector.cpp
+++ b/engines/advancedDetector.cpp
@@ -549,7 +549,7 @@ static bool getFilePropertiesIntern(uint md5Bytes, const AdvancedMetaEngine::Fil
 
 	if (game.flags & ADGF_TAILMD5) {
 		if (testFile.size() > md5Bytes)
-			testFile.seek(-md5Bytes, SEEK_END);
+			testFile.seek(-(int64)md5Bytes, SEEK_END);
 	}
 
 	fileProps.size = testFile.size();


Commit: c9cf81874a4802726673e4b084bdbe6ea98baab1
    https://github.com/scummvm/scummvm/commit/c9cf81874a4802726673e4b084bdbe6ea98baab1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-10-19T21:10:19+03:00

Commit Message:
SCUMM: Added override keywords

Changed paths:
    engines/scumm/charset.h


diff --git a/engines/scumm/charset.h b/engines/scumm/charset.h
index 20573cf1e2..1f6befa114 100644
--- a/engines/scumm/charset.h
+++ b/engines/scumm/charset.h
@@ -299,7 +299,7 @@ public:
 
 	void setCurID(int32 id) override;
 
-	int getStringWidth(int arg, const byte *text, uint strLenMax = 100000);
+	int getStringWidth(int arg, const byte *text, uint strLenMax = 100000) override;
 	int getFontHeight() override;
 	int getCharWidth(uint16 chr) override;
 	void printChar(int chr, bool ignoreCharsetMask) override;
@@ -321,7 +321,7 @@ public:
 
 	void setCurID(int32 id) override;
 
-	int getStringWidth(int arg, const byte *text, uint strLenMax = 1000000);
+	int getStringWidth(int arg, const byte *text, uint strLenMax = 1000000) override;
 	int getFontHeight() override;
 	int getCharHeight(byte chr) override;
 	int getCharWidth(uint16 chr) override;