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

[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:
88bf885d12 SWORD1: Added detection for Czech version with DXA cutscenes. Bug #14274
b04a432c7b AD: Added AD_ENTRY5s and 6s
62e01d3c0d SWORD2: Added detection for GOG.com re-release
c214cbe804 NEWS: Mention Sword1/2 detection entries


Commit: 88bf885d129669b28bd5f2a69e97255e3518b462
    https://github.com/scummvm/scummvm/commit/88bf885d129669b28bd5f2a69e97255e3518b462
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-02T00:07:01+01:00

Commit Message:
SWORD1: Added detection for Czech version with DXA cutscenes. Bug #14274

Changed paths:
    engines/sword1/detection_tables.h


diff --git a/engines/sword1/detection_tables.h b/engines/sword1/detection_tables.h
index cfece70d505..d1910dd8016 100644
--- a/engines/sword1/detection_tables.h
+++ b/engines/sword1/detection_tables.h
@@ -359,6 +359,19 @@ static const ADGameDescription gameDescriptions[] = {
 		GUIO0()
 	},
 
+	{
+		"sword1",
+		"English speech and DXA cutscenes",
+		AD_ENTRY4s("clusters/scripts.clu",  "72b10193714e8c6e4daca51791c0db0c", 1088372,
+				   "clusters/swordres.rif", "239bdd76c405bad0f804a8ae5df4adb0", 59788,
+				   "clusters/text.clu",     "76f93f5feecc8915435105478f3c6615", 3199652,
+				   "smackshi/intro.dxa",    nullptr, -1),
+		Common::CS_CZE,
+		Common::kPlatformWindows,
+		ADGF_NO_FLAGS,
+		GUIO0()
+	},
+
 	{
 		"sword1",
 		"Akella",


Commit: b04a432c7bae4c06ef9c0bfa4079039842b49521
    https://github.com/scummvm/scummvm/commit/b04a432c7bae4c06ef9c0bfa4079039842b49521
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-02T00:07:01+01:00

Commit Message:
AD: Added AD_ENTRY5s and 6s

Changed paths:
    engines/advancedDetector.h


diff --git a/engines/advancedDetector.h b/engines/advancedDetector.h
index 721b53cc22e..cb673b499f0 100644
--- a/engines/advancedDetector.h
+++ b/engines/advancedDetector.h
@@ -84,6 +84,8 @@ struct ADGameFileDescription {
  */
 #define AD_ENTRY3s(f1, x1, s1, f2, x2, s2, f3, x3, s3) {{f1, 0, x1, s1}, {f2, 0, x2, s2}, {f3, 0, x3, s3}, AD_LISTEND}
 #define AD_ENTRY4s(f1, x1, s1, f2, x2, s2, f3, x3, s3, f4, x4, s4) {{f1, 0, x1, s1}, {f2, 0, x2, s2}, {f3, 0, x3, s3}, {f4, 0, x4, s4}, AD_LISTEND}
+#define AD_ENTRY5s(f1, x1, s1, f2, x2, s2, f3, x3, s3, f4, x4, s4, f5, x5, s5) {{f1, 0, x1, s1}, {f2, 0, x2, s2}, {f3, 0, x3, s3}, {f4, 0, x4, s4}, {f5, 0, x5, s5}, AD_LISTEND}
+#define AD_ENTRY6s(f1, x1, s1, f2, x2, s2, f3, x3, s3, f4, x4, s4, f5, x5, s5, f6, x6, s6) {{f1, 0, x1, s1}, {f2, 0, x2, s2}, {f3, 0, x3, s3}, {f4, 0, x4, s4}, {f5, 0, x5, s5}, {f6, 0, x6, s6}, AD_LISTEND}
 
 /**
  * Flags used in the game description.


Commit: 62e01d3c0dc8da115d7226fed1a242fcd6368814
    https://github.com/scummvm/scummvm/commit/62e01d3c0dc8da115d7226fed1a242fcd6368814
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-02T00:07:01+01:00

Commit Message:
SWORD2: Added detection for GOG.com re-release

Changed paths:
    engines/sword2/detection.cpp
    engines/sword2/detection_tables.h
    engines/sword2/sword2.cpp


diff --git a/engines/sword2/detection.cpp b/engines/sword2/detection.cpp
index 295cd88fc6f..16f9fd118c9 100644
--- a/engines/sword2/detection.cpp
+++ b/engines/sword2/detection.cpp
@@ -38,6 +38,7 @@ static const char *const directoryGlobs[] = {
 	"clusters",
 	"smacks",
 	"video",
+	"extras", // GOG.com
 	nullptr
 };
 
diff --git a/engines/sword2/detection_tables.h b/engines/sword2/detection_tables.h
index 5f9325951f2..50e8a301ad1 100644
--- a/engines/sword2/detection_tables.h
+++ b/engines/sword2/detection_tables.h
@@ -81,6 +81,20 @@ static const ADGameDescription gameDescriptions[] = {
 		GUIO0()
 	},
 
+	{ // GOG.com release version 2.0.0.6
+		"sword2",
+		"GOG",
+		AD_ENTRY5s("general.clu", "31db8564f9187538f24d9fda0677f666", 7059728,
+				   "text.clu",    "9b344d976ca8d19a1cf5aa4413397f6b", 304968,
+				   "speech1.clu", "a403904a0e825356107d228f8f74092e", 176260048,
+				   "docks.clu",   "b39246fbb5b955a29f9a207c69bfc318", 20262263,
+				   "eye.dxa",     "7aef7fcb4faae760e82e0c7d3b336ac9", 7052599),
+		Common::EN_ANY,
+		Common::kPlatformWindows,
+		ADGF_NO_FLAGS,
+		GUIO0()
+	},
+
 	{
 		"sword2",
 		"1CD release",
diff --git a/engines/sword2/sword2.cpp b/engines/sword2/sword2.cpp
index 8942b6769db..6a354eacfdb 100644
--- a/engines/sword2/sword2.cpp
+++ b/engines/sword2/sword2.cpp
@@ -56,6 +56,7 @@ Sword2Engine::Sword2Engine(OSystem *syst, const ADGameDescription *gameDesc) : E
 	SearchMan.addSubDirectoryMatching(gameDataDir, "sword2");
 	SearchMan.addSubDirectoryMatching(gameDataDir, "video");
 	SearchMan.addSubDirectoryMatching(gameDataDir, "smacks");
+	SearchMan.addSubDirectoryMatching(gameDataDir, "extras"); // GOG.com
 	SearchMan.addSubDirectoryMatching(gameDataDir, "streams"); // PSX video
 
 	_features = gameDesc->flags;


Commit: c214cbe804ba2f7c5177d2f0241bf503bb32e55c
    https://github.com/scummvm/scummvm/commit/c214cbe804ba2f7c5177d2f0241bf503bb32e55c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-03-02T00:11:37+01:00

Commit Message:
NEWS: Mention Sword1/2 detection entries

Changed paths:
    NEWS.md


diff --git a/NEWS.md b/NEWS.md
index d62628fcf3d..4463e58ca37 100644
--- a/NEWS.md
+++ b/NEWS.md
@@ -24,6 +24,12 @@ For a more comprehensive changelog of the latest experimental code, see:
  SAGA2:
    - Fixed crash when hovering over certain spells.
 
+ Sword1:
+   - Added detection for Czech version with ScummVM cutscenes.
+
+ Sword2:
+   - Added support for GOG.com version.
+
  RISC OS port:
    - Fixed crash on RISC OS 5 with games that require lots of RAM.