[Scummvm-git-logs] scummvm master -> 092886fcb3dd1425782dc8e87cddffe8f0193d52
sev-
sev at scummvm.org
Sat Nov 28 16:42:17 UTC 2020
This automated email contains information about 23 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
2722235c86 LAB: Use AD_ENTRY2s in the detection table
f397bdd74f LILLUPUT: Use macros in the detection table
3bcff619e7 MADE: Add GOG.com version to detection and mark it as unsupported
bd815e3bf4 MADS: Use macros in the detection table
241aa1ac9e MORTEVIELLE: Use macros in the detection table
b495b65a23 PARALLACTION Use macros in detection table
bd49883a7a PARALLACTION: Mark Big Red Adventure as unstable
31066e7ecb PRINCE: Use AD_ENTRY2s in the detection table
90e360f818 QUEEN: Added Hebrew detection entry
29e352569f SHERLOCK: Use AD_ENTRY2s in the detection table
180004e47e STARK: Use macros in the detection table
dfffded8f8 TINSEL: Use AD_ENTRY2s macro in the detection table
d7175672bc TOLTECS: JANITORIAL: Whitespace fixes
82e855b7c0 TONY: Use macros in detection table
7df2ef70e8 TSAGE: Mark Spanish CD version of Blue Force as unsupported
e1f3b5e9a9 ULTIMA: Use AD_ENTRY2s in the detection table
9ea38c179f XEEN: Use macros in the detection tables
d3b00f006a ZVISION: Use AD_ENTRY2s in the detection table
a534bb122a MYST3: Mark PS2 versions as not supported
4b095ef4b9 COMMON: Added Sega Saturn as a platofrm
279a277bb3 TINSEL: Marked Saturn DW1 as unsupported
7d9b2c7d4e SAGA: Give clarification to the user why certain versions of ITE are not supported
092886fcb3 I18N: Clarify files in POTFILES
Commit: 2722235c86e9720e4aefd217c15879ffeb44ff17
https://github.com/scummvm/scummvm/commit/2722235c86e9720e4aefd217c15879ffeb44ff17
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-28T17:41:23+01:00
Commit Message:
LAB: Use AD_ENTRY2s in the detection table
Changed paths:
engines/lab/detection.cpp
diff --git a/engines/lab/detection.cpp b/engines/lab/detection.cpp
index a75f57405d..fe77b04844 100644
--- a/engines/lab/detection.cpp
+++ b/engines/lab/detection.cpp
@@ -40,11 +40,8 @@ static const ADGameDescription labDescriptions[] = {
{
"lab",
"",
- {
- { "doors", 0, "d77536010e7e5ae17ee066323ceb9585", 2537 }, // game/doors
- { "noteold.fon", 0, "6c1d90ad55149556e79d3f7bfddb4bd7", 9252 }, // game/spict/noteold.fon
- { NULL, 0, NULL, 0 }
- },
+ AD_ENTRY2s("doors", "d77536010e7e5ae17ee066323ceb9585", 2537, // game/doors
+ "noteold.fon", "6c1d90ad55149556e79d3f7bfddb4bd7", 9252), // game/spict/noteold.fon
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
@@ -53,11 +50,8 @@ static const ADGameDescription labDescriptions[] = {
{
"lab",
"Lowres",
- {
- { "doors", 0, "d77536010e7e5ae17ee066323ceb9585", 2537 }, // game/doors
- { "64b", 0, "3a84d41bcc6a782f22e8e954bce09721", 39916 }, // game/pict/h2/64b
- { NULL, 0, NULL, 0 }
- },
+ AD_ENTRY2s("doors", "d77536010e7e5ae17ee066323ceb9585", 2537, // game/doors
+ "64b", "3a84d41bcc6a782f22e8e954bce09721", 39916), // game/pict/h2/64b
Common::EN_ANY,
Common::kPlatformDOS,
Lab::GF_LOWRES | ADGF_NO_FLAGS,
Commit: f397bdd74fdfb9652805bf027f4f21fb13f5a2ed
https://github.com/scummvm/scummvm/commit/f397bdd74fdfb9652805bf027f4f21fb13f5a2ed
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-28T17:41:23+01:00
Commit Message:
LILLUPUT: Use macros in the detection table
Changed paths:
engines/lilliput/detection.cpp
diff --git a/engines/lilliput/detection.cpp b/engines/lilliput/detection.cpp
index 7a6d614839..e8c267dd8a 100644
--- a/engines/lilliput/detection.cpp
+++ b/engines/lilliput/detection.cpp
@@ -41,11 +41,8 @@ static const LilliputGameDescription gameDescriptions[] = {
{
{
"robin", 0,
- {
- {"erules.prg", 0, "92aaf84693a8948497ad57864fa31c2a", 71010},
- {"isomap.dta", 0, "bad97eae03a4db3e99565e39b0b3c06a", 16384},
- AD_LISTEND
- },
+ AD_ENTRY2s("erules.prg", "92aaf84693a8948497ad57864fa31c2a", 71010,
+ "isomap.dta", "bad97eae03a4db3e99565e39b0b3c06a", 16384),
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_UNSTABLE,
@@ -57,11 +54,8 @@ static const LilliputGameDescription gameDescriptions[] = {
{
{
"robin", 0,
- {
- {"frules.prg", 0, "cf076c5ebfe8b3571e74a6a46d79426f", 76660},
- {"isomap.dta", 0, "bad97eae03a4db3e99565e39b0b3c06a", 16384},
- AD_LISTEND
- },
+ AD_ENTRY2s("frules.prg", "cf076c5ebfe8b3571e74a6a46d79426f", 76660,
+ "isomap.dta", "bad97eae03a4db3e99565e39b0b3c06a", 16384),
Common::FR_FRA,
Common::kPlatformDOS,
ADGF_UNSTABLE,
@@ -73,11 +67,8 @@ static const LilliputGameDescription gameDescriptions[] = {
{
{
"robin", 0,
- {
- {"grules.prg", 0, "b53b7353dc1e841b206a64851e7bc58c", 78050},
- {"isomap.dta", 0, "bad97eae03a4db3e99565e39b0b3c06a", 16384},
- AD_LISTEND
- },
+ AD_ENTRY2s("grules.prg", "b53b7353dc1e841b206a64851e7bc58c", 78050,
+ "isomap.dta", "bad97eae03a4db3e99565e39b0b3c06a", 16384),
Common::DE_DEU,
Common::kPlatformDOS,
ADGF_UNSTABLE,
@@ -89,11 +80,8 @@ static const LilliputGameDescription gameDescriptions[] = {
{
{
"robin", 0,
- {
- {"irules.prg", 0, "4d69ed3cda1e1d73585905517ea705d1", 75654},
- {"isomap.dta", 0, "bad97eae03a4db3e99565e39b0b3c06a", 16384},
- AD_LISTEND
- },
+ AD_ENTRY2s("irules.prg", "4d69ed3cda1e1d73585905517ea705d1", 75654,
+ "isomap.dta", "bad97eae03a4db3e99565e39b0b3c06a", 16384),
Common::IT_ITA,
Common::kPlatformDOS,
ADGF_UNSTABLE,
Commit: 3bcff619e7b5f4ca4208df214057328b17847fa1
https://github.com/scummvm/scummvm/commit/3bcff619e7b5f4ca4208df214057328b17847fa1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-28T17:41:23+01:00
Commit Message:
MADE: Add GOG.com version to detection and mark it as unsupported
Changed paths:
A engines/made/POTFILES
engines/made/detection_tables.h
diff --git a/engines/made/POTFILES b/engines/made/POTFILES
new file mode 100644
index 0000000000..7c70735d00
--- /dev/null
+++ b/engines/made/POTFILES
@@ -0,0 +1 @@
+engines/made/detection.cpp
diff --git a/engines/made/detection_tables.h b/engines/made/detection_tables.h
index 7634f083f7..74bdf3a0d6 100644
--- a/engines/made/detection_tables.h
+++ b/engines/made/detection_tables.h
@@ -24,6 +24,7 @@
#define MADE_DETECTION_TABLES_H
#include "engines/advancedDetector.h"
+#include "common/translation.h"
namespace Made {
@@ -350,24 +351,24 @@ static const MadeGameDescription gameDescriptions[] = {
3,
},
-// The Manhole: Masterpiece Edition is not a MADE engine and should not be
-// added to the detection list. It is a HyperCard-like engine
-// {
-// // The Manhole: Masterpiece Edition (GOG/CD)
-// {
-// "manhole",
-// "",
-// AD_ENTRY1("manhole.dat", "e8cec9bf21e4c50a7ebc193a4e0b48f5"),
-// Common::EN_ANY,
-// Common::kPlatformDOS,
-// ADGF_UNSTABLE,
-// GUIO1(GUIO_NOSPEECH)
-// },
-// GID_MANHOLE,
-// 0,
-// GF_CD,
-// 2,
-// },
+ // The Manhole: Masterpiece Edition is not a MADE engine and cannot be
+ // supported by MADE. It is a HyperCard-like engine
+ {
+ // The Manhole: Masterpiece Edition (GOG/CD)
+ {
+ "manhole",
+ _s("The game is using unsupported engine"),
+ AD_ENTRY1("manhole.dat", "e8cec9bf21e4c50a7ebc193a4e0b48f5"),
+ Common::EN_ANY,
+ Common::kPlatformDOS,
+ ADGF_UNSUPPORTED,
+ GUIO1(GUIO_NOSPEECH)
+ },
+ GID_MANHOLE,
+ 0,
+ GF_CD,
+ 2,
+ },
{
// The Manhole: New and Enhanced
Commit: bd815e3bf4259eb853035a0e8de7a9ba500f8776
https://github.com/scummvm/scummvm/commit/bd815e3bf4259eb853035a0e8de7a9ba500f8776
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-28T17:41:23+01:00
Commit Message:
MADS: Use macros in the detection table
Changed paths:
engines/mads/detection_tables.h
diff --git a/engines/mads/detection_tables.h b/engines/mads/detection_tables.h
index d2e13816ab..9ea83d51e0 100644
--- a/engines/mads/detection_tables.h
+++ b/engines/mads/detection_tables.h
@@ -30,10 +30,7 @@ static const MADSGameDescription gameDescriptions[] = {
{
"nebular",
0,
- {
- {"mpslabs.001", 0, "4df5c557b52abb5b661cf4befe5ae301", 1315354},
- AD_LISTEND
- },
+ AD_ENTRY1s("mpslabs.001", "4df5c557b52abb5b661cf4befe5ae301", 1315354),
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
@@ -49,10 +46,7 @@ static const MADSGameDescription gameDescriptions[] = {
{
"nebular",
0,
- {
- {"section1.hag", 0, "6f725eb38660de8af31ec7cdd628d615", 927222},
- AD_LISTEND
- },
+ AD_ENTRY1s("section1.hag", "6f725eb38660de8af31ec7cdd628d615", 927222),
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
@@ -71,10 +65,7 @@ static const MADSGameDescription gameDescriptions[] = {
{
"nebular",
0,
- {
- { "section1.hag", 0, "d583576923e3437937fb7f46f4b6274f", 927222 },
- AD_LISTEND
- },
+ AD_ENTRY1s("section1.hag", "d583576923e3437937fb7f46f4b6274f", 927222),
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
@@ -89,10 +80,7 @@ static const MADSGameDescription gameDescriptions[] = {
{
"phantom",
0,
- {
- {"section1.hag", 0, "76e2d47a7aebafe48edc9884b3d91782", 1130939},
- AD_LISTEND
- },
+ AD_ENTRY1s("section1.hag", "76e2d47a7aebafe48edc9884b3d91782", 1130939),
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_UNSTABLE,
@@ -107,10 +95,7 @@ static const MADSGameDescription gameDescriptions[] = {
{
"dragonsphere",
0,
- {
- {"section1.hag", 0, "2770e441d296be5e806194693eebd95a", 2061199},
- AD_LISTEND
- },
+ AD_ENTRY1s("section1.hag", "2770e441d296be5e806194693eebd95a", 2061199),
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_UNSTABLE,
@@ -125,10 +110,7 @@ static const MADSGameDescription gameDescriptions[] = {
{
"dragonsphere",
"Demo",
- {
- {"section1.hag", 0, "9587b06eb4f9ee7ed5b19af4643743b0", 328083},
- AD_LISTEND
- },
+ AD_ENTRY1s("section1.hag", "9587b06eb4f9ee7ed5b19af4643743b0", 328083),
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_UNSTABLE | ADGF_DEMO,
Commit: 241aa1ac9e5a6016eeb054699c63233e748c138d
https://github.com/scummvm/scummvm/commit/241aa1ac9e5a6016eeb054699c63233e748c138d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-28T17:41:23+01:00
Commit Message:
MORTEVIELLE: Use macros in the detection table
Changed paths:
engines/mortevielle/detection_tables.h
diff --git a/engines/mortevielle/detection_tables.h b/engines/mortevielle/detection_tables.h
index 8c356029fb..b9b8333cc9 100644
--- a/engines/mortevielle/detection_tables.h
+++ b/engines/mortevielle/detection_tables.h
@@ -28,11 +28,8 @@ static const MortevielleGameDescription MortevielleGameDescriptions[] = {
{
"mortevielle",
"",
- {
- {"menufr.mor", 0, "e413f36b9e14eef16130adc347a9391f", 144},
- {"dxx.mor", 0, "949e68e829ecd5ad29e36a00347a9e7e", 207744},
- AD_LISTEND
- },
+ AD_ENTRY2s("menufr.mor", "e413f36b9e14eef16130adc347a9391f", 144,
+ "dxx.mor", "949e68e829ecd5ad29e36a00347a9e7e", 207744),
Common::FR_FRA,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
@@ -44,11 +41,8 @@ static const MortevielleGameDescription MortevielleGameDescriptions[] = {
{
"mortevielle",
"",
- {
- {"menual.mor", 0, "792aea282b07a1d74c4a4abeabc90c19", 144},
- {"dxx.mor", 0, "949e68e829ecd5ad29e36a00347a9e7e", 207744},
- AD_LISTEND
- },
+ AD_ENTRY2s("menual.mor", "792aea282b07a1d74c4a4abeabc90c19", 144,
+ "dxx.mor", "949e68e829ecd5ad29e36a00347a9e7e", 207744),
Common::DE_DEU,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
@@ -61,11 +55,8 @@ static const MortevielleGameDescription MortevielleGameDescriptions[] = {
// {
// "mortevielle",
// "Improved Translation",
-// {
-// {"menual.mor", 0, "792aea282b07a1d74c4a4abeabc90c19", 144},
-// {"dxx.mor", 0, "949e68e829ecd5ad29e36a00347a9e7e", 207744},
-// AD_LISTEND
-// },
+// AD_ENTRY2s("menual.mor", "792aea282b07a1d74c4a4abeabc90c19", 144,
+// "dxx.mor", "949e68e829ecd5ad29e36a00347a9e7e", 207744),
// Common::DE_DEU,
// Common::kPlatformDOS,
// ADGF_NO_FLAGS,
@@ -80,12 +71,9 @@ static const MortevielleGameDescription MortevielleGameDescriptions[] = {
{
{
"mortevielle",
- "",
- {
- {"menufr.mor", 0, "e413f36b9e14eef16130adc347a9391f", 144},
- {"dxx.mor", 0, "949e68e829ecd5ad29e36a00347a9e7e", 207744},
- AD_LISTEND
- },
+ "",
+ AD_ENTRY2s("menufr.mor", "e413f36b9e14eef16130adc347a9391f", 144,
+ "dxx.mor", "949e68e829ecd5ad29e36a00347a9e7e", 207744),
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
@@ -97,12 +85,9 @@ static const MortevielleGameDescription MortevielleGameDescriptions[] = {
{
{
"mortevielle",
- "",
- {
- {"menual.mor", 0, "792aea282b07a1d74c4a4abeabc90c19", 144},
- {"dxx.mor", 0, "949e68e829ecd5ad29e36a00347a9e7e", 207744},
- AD_LISTEND
- },
+ "",
+ AD_ENTRY2s("menual.mor", "792aea282b07a1d74c4a4abeabc90c19", 144,
+ "dxx.mor", "949e68e829ecd5ad29e36a00347a9e7e", 207744),
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
@@ -115,11 +100,8 @@ static const MortevielleGameDescription MortevielleGameDescriptions[] = {
{
"mortevielle",
"",
- {
- {"menu.mor", 0, "3fef0a3f8fca99fdcb6dbca8cbcef46f", 160},
- {"dxx.mor", 0, "949e68e829ecd5ad29e36a00347a9e7e", 207744},
- AD_LISTEND
- },
+ AD_ENTRY2s("menu.mor", "3fef0a3f8fca99fdcb6dbca8cbcef46f", 160,
+ "dxx.mor", "949e68e829ecd5ad29e36a00347a9e7e", 207744),
Common::FR_FRA,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
Commit: b495b65a234b0d1fccef8756df5081350b764b27
https://github.com/scummvm/scummvm/commit/b495b65a234b0d1fccef8756df5081350b764b27
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-28T17:41:23+01:00
Commit Message:
PARALLACTION Use macros in detection table
Changed paths:
engines/parallaction/detection.cpp
diff --git a/engines/parallaction/detection.cpp b/engines/parallaction/detection.cpp
index 5a36fa2be3..ff06ec143f 100644
--- a/engines/parallaction/detection.cpp
+++ b/engines/parallaction/detection.cpp
@@ -90,11 +90,8 @@ static const PARALLACTIONGameDescription gameDescriptions[] = {
{
"nippon",
"Demo",
- {
- { "disk0", 0, "6fed2e18a6bfe5e8bb49144fcc95fd11", 624640},
- { "fr", 0, "72f04be4320dfac719431419ec2b9a0d", 12778},
- AD_LISTEND
- },
+ AD_ENTRY2s("disk0", "6fed2e18a6bfe5e8bb49144fcc95fd11", 624640,
+ "fr", "72f04be4320dfac719431419ec2b9a0d", 12778),
Common::EN_ANY,
Common::kPlatformAmiga,
ADGF_DEMO,
@@ -131,11 +128,8 @@ static const PARALLACTIONGameDescription gameDescriptions[] = {
{
"bra",
"Multi-lingual",
- {
- { "tbra.bmp", 0, "3174c095a0e1a4eaf05c403445711e9b", 80972 },
- { "russia.fnt", 0, "57f85ff62aeca6334fdcaf718e313b49", 18344 },
- AD_LISTEND
- },
+ AD_ENTRY2s("tbra.bmp", "3174c095a0e1a4eaf05c403445711e9b", 80972,
+ "russia.fnt", "57f85ff62aeca6334fdcaf718e313b49", 18344),
Common::UNK_LANG,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
@@ -149,10 +143,7 @@ static const PARALLACTIONGameDescription gameDescriptions[] = {
{
"bra",
"Demo",
- {
- { "russia.fnt", 0, "0dd55251d2886d6783718df2b184bf97", 10649 },
- AD_LISTEND
- },
+ AD_ENTRY1s("russia.fnt", "0dd55251d2886d6783718df2b184bf97", 10649),
Common::UNK_LANG,
Common::kPlatformDOS,
ADGF_DEMO,
@@ -166,10 +157,7 @@ static const PARALLACTIONGameDescription gameDescriptions[] = {
{
"bra",
"Multi-lingual",
- {
- { "request.win", 0, "7a844b9518310e4cc72eabb9c0340314", 6497 },
- AD_LISTEND
- },
+ AD_ENTRY1s("request.win", "7a844b9518310e4cc72eabb9c0340314", 6497),
Common::UNK_LANG,
Common::kPlatformAmiga,
ADGF_NO_FLAGS,
@@ -183,10 +171,7 @@ static const PARALLACTIONGameDescription gameDescriptions[] = {
{
"bra",
"Demo",
- {
- { "request.win", 0, "3b6a99ffd626e324b663839bbad59cb3", 5326 },
- AD_LISTEND
- },
+ AD_ENTRY1s("request.win", "3b6a99ffd626e324b663839bbad59cb3", 5326),
Common::UNK_LANG,
Common::kPlatformAmiga,
ADGF_DEMO,
Commit: bd49883a7a457e7b2f90b44daefbaf73e346917d
https://github.com/scummvm/scummvm/commit/bd49883a7a457e7b2f90b44daefbaf73e346917d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-28T17:41:23+01:00
Commit Message:
PARALLACTION: Mark Big Red Adventure as unstable
Changed paths:
engines/parallaction/detection.cpp
diff --git a/engines/parallaction/detection.cpp b/engines/parallaction/detection.cpp
index ff06ec143f..e30fa619c2 100644
--- a/engines/parallaction/detection.cpp
+++ b/engines/parallaction/detection.cpp
@@ -132,7 +132,7 @@ static const PARALLACTIONGameDescription gameDescriptions[] = {
"russia.fnt", "57f85ff62aeca6334fdcaf718e313b49", 18344),
Common::UNK_LANG,
Common::kPlatformDOS,
- ADGF_NO_FLAGS,
+ ADGF_UNSTABLE,
GUIO1(GUIO_NOSPEECH)
},
GType_BRA,
@@ -146,7 +146,7 @@ static const PARALLACTIONGameDescription gameDescriptions[] = {
AD_ENTRY1s("russia.fnt", "0dd55251d2886d6783718df2b184bf97", 10649),
Common::UNK_LANG,
Common::kPlatformDOS,
- ADGF_DEMO,
+ ADGF_DEMO | ADGF_UNSTABLE,
GUIO1(GUIO_NOSPEECH)
},
GType_BRA,
@@ -160,7 +160,7 @@ static const PARALLACTIONGameDescription gameDescriptions[] = {
AD_ENTRY1s("request.win", "7a844b9518310e4cc72eabb9c0340314", 6497),
Common::UNK_LANG,
Common::kPlatformAmiga,
- ADGF_NO_FLAGS,
+ ADGF_UNSTABLE,
GUIO1(GUIO_NOSPEECH)
},
GType_BRA,
@@ -174,7 +174,7 @@ static const PARALLACTIONGameDescription gameDescriptions[] = {
AD_ENTRY1s("request.win", "3b6a99ffd626e324b663839bbad59cb3", 5326),
Common::UNK_LANG,
Common::kPlatformAmiga,
- ADGF_DEMO,
+ ADGF_DEMO | ADGF_UNSTABLE,
GUIO1(GUIO_NOSPEECH)
},
GType_BRA,
Commit: 31066e7ecbf5d7960a7e4b08440ed7ba7a2ed528
https://github.com/scummvm/scummvm/commit/31066e7ecbf5d7960a7e4b08440ed7ba7a2ed528
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-28T17:41:23+01:00
Commit Message:
PRINCE: Use AD_ENTRY2s in the detection table
Changed paths:
engines/prince/detection.cpp
diff --git a/engines/prince/detection.cpp b/engines/prince/detection.cpp
index a5b8758b4a..d56bdaef49 100644
--- a/engines/prince/detection.cpp
+++ b/engines/prince/detection.cpp
@@ -95,11 +95,8 @@ static const PrinceGameDescription gameDescriptions[] = {
{
"prince",
"w/translation",
- {
- {"databank.ptc", 0, "5fa03833177331214ec1354761b1d2ee", 3565031},
- {"prince_translation.dat", 0, 0, -1},
- AD_LISTEND
- },
+ AD_ENTRY2s("databank.ptc", "5fa03833177331214ec1354761b1d2ee", 3565031,
+ "prince_translation.dat", 0, -1),
Common::EN_ANY,
Common::kPlatformWindows,
GF_TRANSLATED | ADGF_DROPPLATFORM,
@@ -111,11 +108,8 @@ static const PrinceGameDescription gameDescriptions[] = {
{
"prince",
"w/translation",
- {
- {"databank.ptc", 0, "48ec9806bda9d152acbea8ce31c93c49", 3435298},
- {"prince_translation.dat", 0, 0, -1},
- AD_LISTEND
- },
+ AD_ENTRY2s("databank.ptc", "48ec9806bda9d152acbea8ce31c93c49", 3435298,
+ "prince_translation.dat", 0, -1),
Common::EN_ANY,
Common::kPlatformWindows,
GF_TRANSLATED | ADGF_DROPPLATFORM,
Commit: 90e360f818119ba678ebc29377437303e5ef3e36
https://github.com/scummvm/scummvm/commit/90e360f818119ba678ebc29377437303e5ef3e36
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-28T17:41:23+01:00
Commit Message:
QUEEN: Added Hebrew detection entry
Changed paths:
engines/queen/detection.cpp
diff --git a/engines/queen/detection.cpp b/engines/queen/detection.cpp
index 49dbfa9ec5..a596aeed6e 100644
--- a/engines/queen/detection.cpp
+++ b/engines/queen/detection.cpp
@@ -250,20 +250,18 @@ static const QueenGameDescription gameDescriptions[] = {
},
},
-#if 0
// DOS CD - Hebrew
{
{
"queen",
"Talkie",
- AD_ENTRY1s("queen.1", NULL, 190705558), // TODO: Fill in correct MD5
+ AD_ENTRY1s("queen.1", "b6302bccf70463de3d5faf0f0628f742", 190705558),
Common::HE_ISR,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
GUIO1(GAMEOPTION_ALT_INTRO)
},
},
-#endif
// DOS Floppy - Italian
{
Commit: 29e352569f63fa621bb1e044795205d2478957ca
https://github.com/scummvm/scummvm/commit/29e352569f63fa621bb1e044795205d2478957ca
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-28T17:41:23+01:00
Commit Message:
SHERLOCK: Use AD_ENTRY2s in the detection table
Changed paths:
engines/sherlock/detection_tables.h
diff --git a/engines/sherlock/detection_tables.h b/engines/sherlock/detection_tables.h
index b942b4161b..fe34f2449e 100644
--- a/engines/sherlock/detection_tables.h
+++ b/engines/sherlock/detection_tables.h
@@ -67,10 +67,9 @@ static const SherlockGameDescription gameDescriptions[] = {
// Provided by m_kiewitz
{
"scalpel",
- 0, {
- {"talk.lib", 0, "40a5f9f37c0e0d2ad48d8f44d8e393c9", 284278},
- {"music.lib", 0, "68ae2f7684ecf903bd60a00bb6bae195", 366465},
- AD_LISTEND},
+ 0,
+ AD_ENTRY2s("talk.lib", "40a5f9f37c0e0d2ad48d8f44d8e393c9", 284278,
+ "music.lib", "68ae2f7684ecf903bd60a00bb6bae195", 366465),
Common::DE_DEU,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
@@ -85,10 +84,9 @@ static const SherlockGameDescription gameDescriptions[] = {
// Provided by mgerhardy
{
"scalpel",
- 0, {
- {"talk.lib", 0, "44652e54172e13b1b075b1ef7d89de24", 284043},
- {"music.lib", 0, "68ae2f7684ecf903bd60a00bb6bae195", 366465},
- AD_LISTEND},
+ 0,
+ AD_ENTRY2s("talk.lib", "44652e54172e13b1b075b1ef7d89de24", 284043,
+ "music.lib", "68ae2f7684ecf903bd60a00bb6bae195", 366465),
Common::DE_DEU,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
@@ -103,14 +101,13 @@ static const SherlockGameDescription gameDescriptions[] = {
// Provided by max565
{
"scalpel",
- 0, {
- {"talk.lib", 0, "3d813fd8505b391a1f8b3a16b1aa7f2e", 284195},
- {"music.lib", 0, "68ae2f7684ecf903bd60a00bb6bae195", 366465},
- AD_LISTEND },
- Common::DE_DEU,
- Common::kPlatformDOS,
- ADGF_NO_FLAGS,
- GUIO6(GUIO_NOSPEECH, GAMEOPTION_ORIGINAL_SAVES, GAMEOPTION_FADE_STYLE, GAMEOPTION_HELP_STYLE,
+ 0,
+ AD_ENTRY2s("talk.lib", "3d813fd8505b391a1f8b3a16b1aa7f2e", 284195,
+ "music.lib", "68ae2f7684ecf903bd60a00bb6bae195", 366465),
+ Common::DE_DEU,
+ Common::kPlatformDOS,
+ ADGF_NO_FLAGS,
+ GUIO6(GUIO_NOSPEECH, GAMEOPTION_ORIGINAL_SAVES, GAMEOPTION_FADE_STYLE, GAMEOPTION_HELP_STYLE,
GAMEOPTION_PORTRAITS_ON, GAMEOPTION_WINDOW_STYLE)
},
GType_SerratedScalpel,
@@ -121,10 +118,9 @@ static const SherlockGameDescription gameDescriptions[] = {
// Provided by m_kiewitz
{
"scalpel",
- 0, {
- {"talk.lib", 0, "27697804b637a7f3b77234bf16f15dce", 171419},
- {"music.lib", 0, "68ae2f7684ecf903bd60a00bb6bae195", 366465},
- AD_LISTEND},
+ 0,
+ AD_ENTRY2s("talk.lib", "27697804b637a7f3b77234bf16f15dce", 171419,
+ "music.lib", "68ae2f7684ecf903bd60a00bb6bae195", 366465),
Common::ES_ESP,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
@@ -154,10 +150,9 @@ static const SherlockGameDescription gameDescriptions[] = {
// Case of the Serrated Scalpel - Italian fan translation
{
"scalpel",
- 0, {
- {"talk.lib", 0, "1a547f96476a3a50cf6f0d599a4f5bcc", 247406},
- {"music.lib", 0, "68ae2f7684ecf903bd60a00bb6bae195", 366465},
- AD_LISTEND},
+ 0,
+ AD_ENTRY2s("talk.lib", "1a547f96476a3a50cf6f0d599a4f5bcc", 247406,
+ "music.lib", "68ae2f7684ecf903bd60a00bb6bae195", 366465),
Common::IT_ITA,
Common::kPlatformDOS,
ADGF_UNSTABLE,
Commit: 180004e47e3d0b73c8f658b41066092d5128a10a
https://github.com/scummvm/scummvm/commit/180004e47e3d0b73c8f658b41066092d5128a10a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-28T17:41:23+01:00
Commit Message:
STARK: Use macros in the detection table
Changed paths:
engines/stark/detection.cpp
diff --git a/engines/stark/detection.cpp b/engines/stark/detection.cpp
index f2058cdfd0..a71fa028e5 100644
--- a/engines/stark/detection.cpp
+++ b/engines/stark/detection.cpp
@@ -35,11 +35,9 @@ static const ADGameDescription gameDescriptions[] = {
// The Longest Journey
// English DVD
{
- "tlj", "DVD", {
- {"x.xarc", 0, "de8327850d7bba90b690b141eaa23f61", 3032},
- {"chapters.ini", 0, "5b5a1f1dd2297d9ce0d3d12216d5d2c5", 485},
- {nullptr, 0, nullptr, 0}
- },
+ "tlj", "DVD",
+ AD_ENTRY2s("x.xarc", "de8327850d7bba90b690b141eaa23f61", 3032,
+ "chapters.ini", "5b5a1f1dd2297d9ce0d3d12216d5d2c5", 485),
Common::EN_ANY,
Common::kPlatformWindows,
ADGF_NO_FLAGS,
@@ -49,11 +47,9 @@ static const ADGameDescription gameDescriptions[] = {
// The Longest Journey
// GOG edition
{
- "tlj", "GOG", {
- {"x.xarc", 0, "a0559457126caadab0cadac02d35f26f", 3032},
- {"chapters.ini", 0, "5b5a1f1dd2297d9ce0d3d12216d5d2c5", 485},
- {nullptr, 0, nullptr, 0}
- },
+ "tlj", "GOG",
+ AD_ENTRY2s("x.xarc", "a0559457126caadab0cadac02d35f26f", 3032,
+ "chapters.ini", "5b5a1f1dd2297d9ce0d3d12216d5d2c5", 485),
Common::EN_ANY,
Common::kPlatformWindows,
ADGF_NO_FLAGS,
@@ -63,11 +59,9 @@ static const ADGameDescription gameDescriptions[] = {
// The Longest Journey
// English Old Demo
{
- "tlj", "Old Demo", {
- {"x.xarc", 0, "97abc1bb9239dee4c208e533f3c97e1c", 98},
- {"chapters.ini", 0, "5b5a1f1dd2297d9ce0d3d12216d5d2c5", 485},
- {nullptr, 0, nullptr, 0}
- },
+ "tlj", "Old Demo",
+ AD_ENTRY2s("x.xarc", "97abc1bb9239dee4c208e533f3c97e1c", 98,
+ "chapters.ini", "5b5a1f1dd2297d9ce0d3d12216d5d2c5", 485),
Common::EN_ANY,
Common::kPlatformWindows,
ADGF_DEMO,
@@ -77,11 +71,9 @@ static const ADGameDescription gameDescriptions[] = {
// The Longest Journey
// English v1.61 Demo
{
- "tlj", "v1.61 Demo", {
- {"x.xarc", 0, "61093bcd499b386ed5c0345c52f48909", 98},
- {"chapters.ini", 0, "5b5a1f1dd2297d9ce0d3d12216d5d2c5", 485},
- {nullptr, 0, nullptr, 0}
- },
+ "tlj", "v1.61 Demo",
+ AD_ENTRY2s("x.xarc", "61093bcd499b386ed5c0345c52f48909", 98,
+ "chapters.ini", "5b5a1f1dd2297d9ce0d3d12216d5d2c5", 485),
Common::EN_ANY,
Common::kPlatformWindows,
ADGF_DEMO,
@@ -91,11 +83,9 @@ static const ADGameDescription gameDescriptions[] = {
// The Longest Journey
// French Demo
{
- "tlj", "Demo", {
- {"x.xarc", 0, "97abc1bb9239dee4c208e533f3c97e1c", 98},
- {"chapters.ini", 0, "e54f6370dca06496069790840409cf95", 506},
- {nullptr, 0, nullptr, 0}
- },
+ "tlj", "Demo",
+ AD_ENTRY2s("x.xarc", "97abc1bb9239dee4c208e533f3c97e1c", 98,
+ "chapters.ini", "e54f6370dca06496069790840409cf95", 506),
Common::FR_FRA,
Common::kPlatformWindows,
ADGF_DEMO,
@@ -105,11 +95,9 @@ static const ADGameDescription gameDescriptions[] = {
// The Longest Journey
// Norwegian Demo
{
- "tlj", "Demo", {
- {"x.xarc", 0, "97abc1bb9239dee4c208e533f3c97e1c", 98},
- {"chapters.ini", 0, "f358f604abd1aa1476ed05d6d271ac70", 473},
- {nullptr, 0, nullptr, 0}
- },
+ "tlj", "Demo",
+ AD_ENTRY2s("x.xarc", "97abc1bb9239dee4c208e533f3c97e1c", 98,
+ "chapters.ini", "f358f604abd1aa1476ed05d6d271ac70", 473),
Common::NB_NOR,
Common::kPlatformWindows,
ADGF_DEMO,
@@ -119,11 +107,9 @@ static const ADGameDescription gameDescriptions[] = {
// The Longest Journey
// Norwegian 4 CD version - supplied by L0ngcat
{
- "tlj", "4 CD", {
- {"x.xarc", 0, "a0559457126caadab0cadac02d35f26f", 3032},
- {"chapters.ini", 0, "f358f604abd1aa1476ed05d6d271ac70", 473},
- {nullptr, 0, nullptr, 0}
- },
+ "tlj", "4 CD",
+ AD_ENTRY2s("x.xarc", "a0559457126caadab0cadac02d35f26f", 3032,
+ "chapters.ini", "f358f604abd1aa1476ed05d6d271ac70", 473),
Common::NB_NOR,
Common::kPlatformWindows,
ADGF_NO_FLAGS,
@@ -133,11 +119,9 @@ static const ADGameDescription gameDescriptions[] = {
// The Longest Journey
// Norwegian DLC-edition (DVD?)
{
- "tlj", "DVD", {
- {"x.xarc", 0, "de8327850d7bba90b690b141eaa23f61", 3032},
- {"chapters.ini", 0, "f358f604abd1aa1476ed05d6d271ac70", 473},
- {nullptr, 0, nullptr, 0}
- },
+ "tlj", "DVD",
+ AD_ENTRY2s("x.arc", "de8327850d7bba90b690b141eaa23f61", 3032,
+ "chapters.ini", "f358f604abd1aa1476ed05d6d271ac70", 473),
Common::NB_NOR,
Common::kPlatformWindows,
ADGF_NO_FLAGS,
@@ -147,11 +131,9 @@ static const ADGameDescription gameDescriptions[] = {
// The Longest Journey
// German DVD version supplied by Vorph on the forums
{
- "tlj", "DVD", {
- {"x.xarc", 0, "de8327850d7bba90b690b141eaa23f61", 3032},
- {"chapters.ini", 0, "e4611d143a87b263d8d7a54edc7e7cd7", 515},
- {nullptr, 0, nullptr, 0}
- },
+ "tlj", "DVD",
+ AD_ENTRY2s("x.arc", "de8327850d7bba90b690b141eaa23f61", 3032,
+ "chapters.ini", "e4611d143a87b263d8d7a54edc7e7cd7", 515),
Common::DE_DEU,
Common::kPlatformWindows,
ADGF_NO_FLAGS,
@@ -161,11 +143,9 @@ static const ADGameDescription gameDescriptions[] = {
// The Longest Journey
// German 4CD
{
- "tlj", "4 CD", {
- {"x.xarc", 0, "a0559457126caadab0cadac02d35f26f", 3032},
- {"chapters.ini", 0, "e4611d143a87b263d8d7a54edc7e7cd7", 515},
- {nullptr, 0, nullptr, 0}
- },
+ "tlj", "4 CD",
+ AD_ENTRY2s("x.arc", "a0559457126caadab0cadac02d35f26f", 3032,
+ "chapters.ini", "e4611d143a87b263d8d7a54edc7e7cd7", 515),
Common::DE_DEU,
Common::kPlatformWindows,
ADGF_NO_FLAGS,
@@ -175,11 +155,9 @@ static const ADGameDescription gameDescriptions[] = {
// The Longest Journey
// Italian DVD version
{
- "tlj", "DVD", {
- {"x.xarc", 0, "de8327850d7bba90b690b141eaa23f61", 3032},
- {"chapters.ini", 0, "9a81ea4e6f5b84511dd4e56d04a64e2e", 498},
- {nullptr, 0, nullptr, 0}
- },
+ "tlj", "DVD",
+ AD_ENTRY2s("x.arc", "de8327850d7bba90b690b141eaa23f61", 3032,
+ "chapters.ini", "9a81ea4e6f5b84511dd4e56d04a64e2e", 498),
Common::IT_ITA,
Common::kPlatformWindows,
ADGF_NO_FLAGS,
@@ -189,11 +167,9 @@ static const ADGameDescription gameDescriptions[] = {
// The Longest Journey
// Italian 4CD
{
- "tlj", "4 CD", {
- {"x.xarc", 0, "a0559457126caadab0cadac02d35f26f", 3032},
- {"chapters.ini", 0, "9a81ea4e6f5b84511dd4e56d04a64e2e", 498},
- {nullptr, 0, nullptr, 0}
- },
+ "tlj", "4 CD",
+ AD_ENTRY2s("x.arc", "a0559457126caadab0cadac02d35f26f", 3032,
+ "chapters.ini", "9a81ea4e6f5b84511dd4e56d04a64e2e", 498),
Common::IT_ITA,
Common::kPlatformWindows,
ADGF_NO_FLAGS,
@@ -203,11 +179,9 @@ static const ADGameDescription gameDescriptions[] = {
// The Longest Journey
// Dutch 4CD
{
- "tlj", "4 CD", {
- {"x.xarc", 0, "a0559457126caadab0cadac02d35f26f", 3032},
- {"chapters.ini", 0, "c8dadd9a3b41640734d6213e89cd5635", 508},
- {nullptr, 0, nullptr, 0}
- },
+ "tlj", "4 CD",
+ AD_ENTRY2s("x.arc", "a0559457126caadab0cadac02d35f26f", 3032,
+ "chapters.ini", "c8dadd9a3b41640734d6213e89cd5635", 508),
Common::NL_NLD,
Common::kPlatformWindows,
ADGF_NO_FLAGS,
@@ -217,11 +191,9 @@ static const ADGameDescription gameDescriptions[] = {
// The Longest Journey
// Spanish 4CD
{
- "tlj", "4 CD", {
- {"x.xarc", 0, "a0559457126caadab0cadac02d35f26f", 3032},
- {"chapters.ini", 0, "3640df6d536b186bff228337284d9631", 525},
- {nullptr, 0, nullptr, 0}
- },
+ "tlj", "4 CD",
+ AD_ENTRY2s("x.arc", "a0559457126caadab0cadac02d35f26f", 3032,
+ "chapters.ini", "3640df6d536b186bff228337284d9631", 525),
Common::ES_ESP,
Common::kPlatformWindows,
ADGF_NO_FLAGS,
@@ -231,11 +203,9 @@ static const ADGameDescription gameDescriptions[] = {
// The Longest Journey
// French 2CD
{
- "tlj", "2 CD", {
- {"x.xarc", 0, "de8327850d7bba90b690b141eaa23f61", 3032},
- {"chapters.ini", 0, "e54f6370dca06496069790840409cf95", 506},
- {nullptr, 0, nullptr, 0}
- },
+ "tlj", "2 CD",
+ AD_ENTRY2s("x.arc", "de8327850d7bba90b690b141eaa23f61", 3032,
+ "chapters.ini", "e54f6370dca06496069790840409cf95", 506),
Common::FR_FRA,
Common::kPlatformWindows,
ADGF_NO_FLAGS,
@@ -245,11 +215,9 @@ static const ADGameDescription gameDescriptions[] = {
// The Longest Journey
// French 4CD
{
- "tlj", "4 CD", {
- {"x.xarc", 0, "a0559457126caadab0cadac02d35f26f", 3032},
- {"chapters.ini", 0, "e54f6370dca06496069790840409cf95", 506},
- {nullptr, 0, nullptr, 0}
- },
+ "tlj", "4 CD",
+ AD_ENTRY2s("x.arc", "a0559457126caadab0cadac02d35f26f", 3032,
+ "chapters.ini", "e54f6370dca06496069790840409cf95", 506),
Common::FR_FRA,
Common::kPlatformWindows,
ADGF_NO_FLAGS,
@@ -259,11 +227,9 @@ static const ADGameDescription gameDescriptions[] = {
// The Longest Journey
// Swedish Demo
{
- "tlj", "Demo", {
- {"x.xarc", 0, "97abc1bb9239dee4c208e533f3c97e1c", 98},
- {"chapters.ini", 0, "f6a2007300209492b7b90b4c0467832d", 462},
- {nullptr, 0, nullptr, 0}
- },
+ "tlj", "Demo",
+ AD_ENTRY2s("x.arc", "97abc1bb9239dee4c208e533f3c97e1c", 98,
+ "chapters.ini", "f6a2007300209492b7b90b4c0467832d", 462),
Common::SE_SWE,
Common::kPlatformWindows,
ADGF_DEMO,
@@ -273,11 +239,9 @@ static const ADGameDescription gameDescriptions[] = {
// The Longest Journey
// Swedish 4CD
{
- "tlj", "4 CD", {
- {"x.xarc", 0, "a0559457126caadab0cadac02d35f26f", 3032},
- {"chapters.ini", 0, "f6a2007300209492b7b90b4c0467832d", 462},
- {nullptr, 0, nullptr, 0}
- },
+ "tlj", "4 CD",
+ AD_ENTRY2s("x.arc", "a0559457126caadab0cadac02d35f26f", 3032,
+ "chapters.ini", "f6a2007300209492b7b90b4c0467832d", 462),
Common::SE_SWE,
Common::kPlatformWindows,
ADGF_NO_FLAGS,
@@ -287,11 +251,9 @@ static const ADGameDescription gameDescriptions[] = {
// The Longest Journey
// Swedish DVD Nordic Special Edition - supplied by L0ngcat
{
- "tlj", "DVD", {
- {"x.xarc", 0, "de8327850d7bba90b690b141eaa23f61", 3032},
- {"chapters.ini", 0, "f6a2007300209492b7b90b4c0467832d", 462},
- {nullptr, 0, nullptr, 0}
- },
+ "tlj", "DVD",
+ AD_ENTRY2s("x.arc", "de8327850d7bba90b690b141eaa23f61", 3032,
+ "chapters.ini", "f6a2007300209492b7b90b4c0467832d", 462),
Common::SE_SWE,
Common::kPlatformWindows,
ADGF_NO_FLAGS,
@@ -301,11 +263,9 @@ static const ADGameDescription gameDescriptions[] = {
// The Longest Journey
// Polish 4CD
{
- "tlj", "4 CD", {
- {"x.xarc", 0, "a0559457126caadab0cadac02d35f26f", 3032},
- {"chapters.ini", 0, "6abc5c38e6e31face4b675355b117620", 499},
- {nullptr, 0, nullptr, 0}
- },
+ "tlj", "4 CD",
+ AD_ENTRY2s("x.arc", "a0559457126caadab0cadac02d35f26f", 3032,
+ "chapters.ini", "6abc5c38e6e31face4b675355b117620", 499),
Common::PL_POL,
Common::kPlatformWindows,
ADGF_NO_FLAGS,
@@ -315,11 +275,9 @@ static const ADGameDescription gameDescriptions[] = {
// The Longest Journey
// Russian 2CD by 1C
{
- "tlj", "2 CD/Fargus", {
- {"x.xarc", 0, "de8327850d7bba90b690b141eaa23f61", 3032},
- {"chapters.ini", 0, "740b97b94e97ed11f064f5fa125ebee1", 486},
- {nullptr, 0, nullptr, 0}
- },
+ "tlj", "2 CD/Fargus",
+ AD_ENTRY2s("x.arc", "de8327850d7bba90b690b141eaa23f61", 3032,
+ "chapters.ini", "740b97b94e97ed11f064f5fa125ebee1", 486),
Common::RU_RUS,
Common::kPlatformWindows,
ADGF_NO_FLAGS,
@@ -329,11 +287,9 @@ static const ADGameDescription gameDescriptions[] = {
// The Longest Journey
// Russian 2CD by 7Wolf
{
- "tlj", "2 CD/7Wolf", {
- {"x.xarc", 0, "a0559457126caadab0cadac02d35f26f", 3032},
- {"chapters.ini", 0, "8e08025c89575d2573c2edf0daa1cb34", 406},
- {nullptr, 0, nullptr, 0}
- },
+ "tlj", "2 CD/7Wolf",
+ AD_ENTRY2s("x.arc", "a0559457126caadab0cadac02d35f26f", 3032,
+ "chapters.ini", "8e08025c89575d2573c2edf0daa1cb34", 406),
Common::RU_RUS,
Common::kPlatformWindows,
ADGF_UNSTABLE,
@@ -343,11 +299,9 @@ static const ADGameDescription gameDescriptions[] = {
// The Longest Journey
// Hungarian fan-made
{
- "tlj", "Fanmade", {
- {"x.xarc", 0, "a0559457126caadab0cadac02d35f26f", 3032},
- {"chapters.ini", 0, "790b51a88b5493bff5168a77738e0e84", 451},
- {nullptr, 0, nullptr, 0}
- },
+ "tlj", "Fanmade",
+ AD_ENTRY2s("x.arc", "a0559457126caadab0cadac02d35f26f", 3032,
+ "chapters.ini", "790b51a88b5493bff5168a77738e0e84", 451),
Common::HU_HUN,
Common::kPlatformWindows,
ADGF_NO_FLAGS,
Commit: dfffded8f83d4b382cb40f9bb24d79c82dbcf8fa
https://github.com/scummvm/scummvm/commit/dfffded8f83d4b382cb40f9bb24d79c82dbcf8fa
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-28T17:41:23+01:00
Commit Message:
TINSEL: Use AD_ENTRY2s macro in the detection table
Changed paths:
engines/tinsel/detection_tables.h
diff --git a/engines/tinsel/detection_tables.h b/engines/tinsel/detection_tables.h
index e191b20228..0bcb023086 100644
--- a/engines/tinsel/detection_tables.h
+++ b/engines/tinsel/detection_tables.h
@@ -59,11 +59,8 @@ static const TinselGameDescription gameDescriptions[] = {
{
"dw",
"CD Demo",
- {
- {"dw.gra", 0, "ef5a2518c9e205f786f5a4526396e661", 781676},
- {"english.smp", 0, NULL, -1},
- AD_LISTEND
- },
+ AD_ENTRY2s("dw.gra", "ef5a2518c9e205f786f5a4526396e661", 781676,
+ "english.smp", NULL, -1),
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_DEMO | ADGF_CD,
@@ -209,11 +206,8 @@ static const TinselGameDescription gameDescriptions[] = {
{
"dw",
"CD",
- {
- {"dw.gra", 0, "c8808ccd988d603dd35dff42013ae7fd", 781656},
- {"english.smp", 0, NULL, -1},
- AD_LISTEND
- },
+ AD_ENTRY2s("dw.gra", "c8808ccd988d603dd35dff42013ae7fd", 781656,
+ "english.smp", NULL, -1),
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_CD,
@@ -229,11 +223,8 @@ static const TinselGameDescription gameDescriptions[] = {
{
"dw",
"CD",
- {
- {"dw.gra", 0, "ef05bbd2a754bd11a2e87bcd84ab5ccf", 781864},
- {"english.smp", 0, NULL, -1},
- AD_LISTEND
- },
+ AD_ENTRY2s("dw.gra", "ef05bbd2a754bd11a2e87bcd84ab5ccf", 781864,
+ "english.smp", NULL, -1),
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_CD,
@@ -382,11 +373,8 @@ static const TinselGameDescription gameDescriptions[] = {
{
"dw",
"CD",
- {
- {"dw.scn", 0, "70955425870c7720d6eebed903b2ef41", 776188},
- {"english.smp", 0, NULL, -1},
- AD_LISTEND
- },
+ AD_ENTRY2s("dw.scn", "70955425870c7720d6eebed903b2ef41", 776188,
+ "english.smp", NULL, -1),
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_CD | ADGF_UNSTABLE,
@@ -402,11 +390,8 @@ static const TinselGameDescription gameDescriptions[] = {
{
"dw",
"CD",
- {
- {"dw.scn", 0, "759d1374b4f02af6d52fc07c96679936", 770780},
- {"english.smp", 0, NULL, -1},
- AD_LISTEND
- },
+ AD_ENTRY2s("dw.scn", "759d1374b4f02af6d52fc07c96679936", 770780,
+ "english.smp", NULL, -1),
Common::HE_ISR,
Common::kPlatformDOS,
ADGF_CD,
@@ -422,10 +407,7 @@ static const TinselGameDescription gameDescriptions[] = {
{
"dw",
"CD",
- {
- {"english.txt", 0, "7526cfc3a64e00f223795de476b4e2c9", 230326},
- AD_LISTEND
- },
+ AD_ENTRY1s("english.txt", "7526cfc3a64e00f223795de476b4e2c9", 230326),
Common::EN_ANY,
Common::kPlatformPSX,
ADGF_CD,
@@ -441,10 +423,7 @@ static const TinselGameDescription gameDescriptions[] = {
{
"dw",
"CD",
- {
- {"dw.scn", 0, "3cbe25971651631fdc33fece642c9c78", 328048},
- AD_LISTEND
- },
+ AD_ENTRY1s("dw.scn", "3cbe25971651631fdc33fece642c9c78", 328048),
Common::JA_JPN,
Common::kPlatformPSX,
ADGF_CD | ADGF_UNSTABLE,
@@ -506,11 +485,8 @@ static const TinselGameDescription gameDescriptions[] = {
{
"dw",
"CD",
- {
- {"dw.scn", 0, "114643df0d1f1530a0a9c5d4e38917bc", 1268553},
- {"english.smp", 0, NULL, -1},
- AD_LISTEND
- },
+ AD_ENTRY2s("dw.scn", "114643df0d1f1530a0a9c5d4e38917bc", 1268553,
+ "english.smp", NULL, -1),
Common::EN_ANY,
Common::kPlatformMacintosh,
ADGF_CD,
@@ -526,11 +502,8 @@ static const TinselGameDescription gameDescriptions[] = {
{
"dw",
"CD",
- {
- {"dw.scn", 0, "cfc40a8d5d476a1c9d3abf826fa46f8c", 1265532},
- {"english.smp", 0, NULL, -1},
- AD_LISTEND
- },
+ AD_ENTRY2s("dw.scn", "cfc40a8d5d476a1c9d3abf826fa46f8c", 1265532,
+ "english.smp", NULL, -1),
Common::EN_ANY,
Common::kPlatformMacintosh,
ADGF_CD,
@@ -584,11 +557,8 @@ static const TinselGameDescription gameDescriptions[] = {
{
"dw",
"CD",
- {
- {"dw.scn", 0, "36795d539e290838fa1d4c11789cb142", 776188},
- {"english.smp", 0, NULL, -1},
- AD_LISTEND
- },
+ AD_ENTRY2s("dw.scn", "36795d539e290838fa1d4c11789cb142", 776188,
+ "english.smp", NULL, -1),
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_CD,
@@ -649,11 +619,8 @@ static const TinselGameDescription gameDescriptions[] = {
{
"dw2",
"Demo",
- {
- {"dw2.scn", 0, "853ab998f5136b69bc586991175d6eeb", 4231121},
- {"english.smp", 0, "b5660a0e031cb4710bcb0ef5629ea61d", 28562357},
- AD_LISTEND
- },
+ AD_ENTRY2s("dw2.scn", "853ab998f5136b69bc586991175d6eeb", 4231121,
+ "english.smp", "b5660a0e031cb4710bcb0ef5629ea61d", 28562357),
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_DEMO,
@@ -669,11 +636,8 @@ static const TinselGameDescription gameDescriptions[] = {
{
"dw2",
"CD",
- {
- {"dw2.scn", 0, "c6d15ce9720a9d8fef06e6582dcf3f34", 103593},
- {"english1.smp", 0, NULL, -1},
- AD_LISTEND
- },
+ AD_ENTRY2s("dw2.scn", "c6d15ce9720a9d8fef06e6582dcf3f34", 103593,
+ "english1.smp", NULL, -1),
Common::EN_GRB,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
@@ -689,11 +653,8 @@ static const TinselGameDescription gameDescriptions[] = {
{
"dw2",
"CD",
- {
- {"dw2.scn", 0, "c6d15ce9720a9d8fef06e6582dcf3f34", 103593},
- {"us1.smp", 0, NULL, -1},
- AD_LISTEND
- },
+ AD_ENTRY2s("dw2.scn", "c6d15ce9720a9d8fef06e6582dcf3f34", 103593,
+ "us1.smp", NULL, -1),
Common::EN_USA,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
@@ -709,11 +670,8 @@ static const TinselGameDescription gameDescriptions[] = {
{
"dw2",
"CD",
- {
- {"dw2.scn", 0, "c6d15ce9720a9d8fef06e6582dcf3f34", 103593},
- {"french1.smp", 0, NULL, -1},
- AD_LISTEND
- },
+ AD_ENTRY2s("dw2.scn", "c6d15ce9720a9d8fef06e6582dcf3f34", 103593,
+ "french1.smp", NULL, -1),
Common::FR_FRA,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
@@ -729,11 +687,8 @@ static const TinselGameDescription gameDescriptions[] = {
{
"dw2",
"CD",
- {
- {"dw2.scn", 0, "c6d15ce9720a9d8fef06e6582dcf3f34", 103593},
- {"german1.smp", 0, NULL, -1},
- AD_LISTEND
- },
+ AD_ENTRY2s("dw2.scn", "c6d15ce9720a9d8fef06e6582dcf3f34", 103593,
+ "german1.smp", NULL, -1),
Common::DE_DEU,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
@@ -814,11 +769,8 @@ static const TinselGameDescription gameDescriptions[] = {
{
"noir",
"CD",
- {
- {"dw3.scn", 0, "16104acdc66cda903f860acac02a96bd", -1},
- {"english.smp", 0, "94e510fd33c5c4a67b274bf5c068a87a", -1},
- {NULL, 0, NULL, 0}
- },
+ AD_ENTRY2s("dw3.scn", "16104acdc66cda903f860acac02a96bd", -1,
+ "english.smp", "94e510fd33c5c4a67b274bf5c068a87a", -1),
Common::EN_ANY,
Common::kPlatformWindows,
ADGF_UNSTABLE,
@@ -835,11 +787,8 @@ static const TinselGameDescription gameDescriptions[] = {
{
"noir",
"Demo",
- {
- {"english.smp", 0, "ecca3ec84ad6460bf289e6171ac32048", 73494004},
- {"dw3.scn", 0, "f8e50c19b44a2c6eaee5f78654647878", 803781},
- {NULL, 0, NULL, 0}
- },
+ AD_ENTRY2s("english.smp", "ecca3ec84ad6460bf289e6171ac32048", 73494004,
+ "dw3.scn", "f8e50c19b44a2c6eaee5f78654647878", 803781),
Common::EN_ANY,
Common::kPlatformWindows,
ADGF_UNSTABLE | ADGF_DEMO,
Commit: d7175672bcaea7271a5dc9e2838b41f4ce4fc4ef
https://github.com/scummvm/scummvm/commit/d7175672bcaea7271a5dc9e2838b41f4ce4fc4ef
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-28T17:41:23+01:00
Commit Message:
TOLTECS: JANITORIAL: Whitespace fixes
Changed paths:
engines/toltecs/detection.cpp
diff --git a/engines/toltecs/detection.cpp b/engines/toltecs/detection.cpp
index 38f74fa9e9..ca7a26d63b 100644
--- a/engines/toltecs/detection.cpp
+++ b/engines/toltecs/detection.cpp
@@ -170,11 +170,11 @@ static const ToltecsGameDescription gameDescriptions[] = {
{
"toltecs",
0,
- AD_ENTRY1s("WESTERN", "57503131c0217c76b07d0b5c14805631", 337644552),
- Common::CZ_CZE,
- Common::kPlatformDOS,
- ADGF_NO_FLAGS,
- GUIO1(GUIO_NONE)
+ AD_ENTRY1s("WESTERN", "57503131c0217c76b07d0b5c14805631", 337644552),
+ Common::CZ_CZE,
+ Common::kPlatformDOS,
+ ADGF_NO_FLAGS,
+ GUIO1(GUIO_NONE)
},
},
Commit: 82e855b7c014fb375764c87e82dfcf0860753e9d
https://github.com/scummvm/scummvm/commit/82e855b7c014fb375764c87e82dfcf0860753e9d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-28T17:41:23+01:00
Commit Message:
TONY: Use macros in detection table
Changed paths:
engines/tony/detection_tables.h
diff --git a/engines/tony/detection_tables.h b/engines/tony/detection_tables.h
index 9dfa80506f..9e3ac6e9e8 100644
--- a/engines/tony/detection_tables.h
+++ b/engines/tony/detection_tables.h
@@ -28,12 +28,9 @@ static const TonyGameDescription gameDescriptions[] = {
{
"tony",
0,
- {
- // TODO: AdvancedDetector seems to have a problem where it thinks data1.cab is unrecognized.
- // Is it perhaps because the Agos engine also has detection entries for data1.cab?
- {"data1.cab", 0, "ce82907242166bfb594d97bdb68f96d2", 4350},
- AD_LISTEND
- },
+ // TODO: AdvancedDetector seems to have a problem where it thinks data1.cab is unrecognized.
+ // Is it perhaps because the Agos engine also has detection entries for data1.cab?
+ AD_ENTRY1s("data1.cab", "ce82907242166bfb594d97bdb68f96d2", 4350),
Common::EN_ANY,
Common::kPlatformWindows,
ADGF_NO_FLAGS,
@@ -46,12 +43,9 @@ static const TonyGameDescription gameDescriptions[] = {
{
"tony",
0,
- {
- // TODO: AdvancedDetector seems to have a problem where it thinks data1.cab is unrecognized.
- // Is it perhaps because the Agos engine also has detection entries for data1.cab?
- {"data1.cab", 0, "c6d5dd8f0c1241a6e3f7861b7f27bf7b", 4350},
- AD_LISTEND
- },
+ // TODO: AdvancedDetector seems to have a problem where it thinks data1.cab is unrecognized.
+ // Is it perhaps because the Agos engine also has detection entries for data1.cab?
+ AD_ENTRY1s("data1.cab", "c6d5dd8f0c1241a6e3f7861b7f27bf7b", 4350),
Common::CZ_CZE,
Common::kPlatformWindows,
ADGF_NO_FLAGS,
@@ -64,11 +58,8 @@ static const TonyGameDescription gameDescriptions[] = {
{
"tony",
"Extracted Demo",
- {
- {"roasted.mpr", 0, "06203dbbc85fdd1e6dc8fc211c1a6207", 14972409},
- {"roasted.mpc", 0, "1e247922ec869712bfd96625bc4d3c7c", 39211},
- AD_LISTEND
- },
+ AD_ENTRY2s("roasted.mpr", "06203dbbc85fdd1e6dc8fc211c1a6207", 14972409,
+ "roasted.mpc", "1e247922ec869712bfd96625bc4d3c7c", 39211),
Common::EN_ANY,
Common::kPlatformWindows,
ADGF_DEMO,
@@ -81,10 +72,7 @@ static const TonyGameDescription gameDescriptions[] = {
{
"tony",
"Demo",
- {
- {"data1.cab", 0, "7d8b6d308f96aee3968ad7910fb11e6d", 58660608},
- AD_LISTEND
- },
+ AD_ENTRY1s("data1.cab", "7d8b6d308f96aee3968ad7910fb11e6d", 58660608),
Common::EN_ANY,
Common::kPlatformWindows,
ADGF_DEMO | GF_COMPRESSED,
@@ -97,11 +85,8 @@ static const TonyGameDescription gameDescriptions[] = {
{
"tony",
0,
- {
- {"roasted.mpr", 0, "06203dbbc85fdd1e6dc8fc211c1a6207", 135911071},
- {"roasted.mpc", 0, "e890c6a41238827bdfa9874a65618b69", 374135},
- AD_LISTEND
- },
+ AD_ENTRY2s("roasted.mpr", "06203dbbc85fdd1e6dc8fc211c1a6207", 135911071,
+ "roasted.mpc", "e890c6a41238827bdfa9874a65618b69", 374135),
Common::FR_FRA,
Common::kPlatformWindows,
ADGF_NO_FLAGS,
@@ -114,11 +99,8 @@ static const TonyGameDescription gameDescriptions[] = {
{
"tony",
0,
- {
- {"roasted.mpr", 0, "06203dbbc85fdd1e6dc8fc211c1a6207", 135911071},
- {"roasted.mpc", 0, "ccf7ab939a34de1b13df538596431684", 389554},
- AD_LISTEND
- },
+ AD_ENTRY2s("roasted.mpr", "06203dbbc85fdd1e6dc8fc211c1a6207", 135911071,
+ "roasted.mpc", "ccf7ab939a34de1b13df538596431684", 389554),
Common::DE_DEU,
Common::kPlatformWindows,
ADGF_NO_FLAGS,
@@ -131,11 +113,8 @@ static const TonyGameDescription gameDescriptions[] = {
{
"tony",
0,
- {
- {"roasted.mpr", 0, "06203dbbc85fdd1e6dc8fc211c1a6207", 135911071},
- {"roasted.mpc", 0, "1dc896cdb945170d7408598f803411c1", 380001},
- AD_LISTEND
- },
+ AD_ENTRY2s("roasted.mpr", "06203dbbc85fdd1e6dc8fc211c1a6207", 135911071,
+ "roasted.mpc", "1dc896cdb945170d7408598f803411c1", 380001),
Common::IT_ITA,
Common::kPlatformWindows,
ADGF_NO_FLAGS,
@@ -148,11 +127,8 @@ static const TonyGameDescription gameDescriptions[] = {
{
"tony",
0,
- {
- {"roasted.mpr", 0, "06203dbbc85fdd1e6dc8fc211c1a6207", 135911071},
- {"roasted.mpc", 0, "6202816f991b15af82aab84e3e4be011", 380183},
- AD_LISTEND
- },
+ AD_ENTRY2s("roasted.mpr", "06203dbbc85fdd1e6dc8fc211c1a6207", 135911071,
+ "roasted.mpc", "6202816f991b15af82aab84e3e4be011", 380183),
Common::IT_ITA,
Common::kPlatformWindows,
ADGF_NO_FLAGS,
@@ -165,11 +141,8 @@ static const TonyGameDescription gameDescriptions[] = {
{
"tony",
0,
- {
- {"roasted.mpr", 0, "06203dbbc85fdd1e6dc8fc211c1a6207", 135911071},
- {"roasted.mpc", 0, "89733ea710669acc8e7900b115f4afef", 389625},
- AD_LISTEND
- },
+ AD_ENTRY2s("roasted.mpr", "06203dbbc85fdd1e6dc8fc211c1a6207", 135911071,
+ "roasted.mpc", "89733ea710669acc8e7900b115f4afef", 389625),
Common::PL_POL,
Common::kPlatformWindows,
ADGF_NO_FLAGS,
@@ -182,11 +155,8 @@ static const TonyGameDescription gameDescriptions[] = {
{
"tony",
0,
- {
- {"roasted.mpr", 0, "06203dbbc85fdd1e6dc8fc211c1a6207", 135911071},
- {"roasted.mpc", 0, "c212a81e34edf92bc177a80f24780bd2", 380200},
- AD_LISTEND
- },
+ AD_ENTRY2s("roasted.mpr", "06203dbbc85fdd1e6dc8fc211c1a6207", 135911071,
+ "roasted.mpc", "c212a81e34edf92bc177a80f24780bd2", 380200),
Common::PL_POL,
Common::kPlatformWindows,
ADGF_NO_FLAGS,
@@ -199,11 +169,8 @@ static const TonyGameDescription gameDescriptions[] = {
{
"tony",
0,
- {
- {"roasted.mpr", 0, "06203dbbc85fdd1e6dc8fc211c1a6207", 135911071},
- {"roasted.mpc", 0, "187de6f88f4083808cb66342ab55a7fd", 389904},
- AD_LISTEND
- },
+ AD_ENTRY2s("roasted.mpr", "06203dbbc85fdd1e6dc8fc211c1a6207", 135911071,
+ "roasted.mpc", "187de6f88f4083808cb66342ab55a7fd", 389904),
Common::DE_DEU,
Common::kPlatformWindows,
ADGF_NO_FLAGS,
@@ -216,12 +183,8 @@ static const TonyGameDescription gameDescriptions[] = {
{
"tony",
0,
- {
- // {"data1.cab", 0, "c6d5dd8f0c1241a6e3f7861b7f27bf7b", 4350},
- {"roasted.mpr", 0, "06203dbbc85fdd1e6dc8fc211c1a6207", 135911071},
- {"roasted.mpc", 0, "a8283a101878f3ca105f1f83f07e2c40", 386491},
- AD_LISTEND
- },
+ AD_ENTRY2s("roasted.mpr", "06203dbbc85fdd1e6dc8fc211c1a6207", 135911071,
+ "roasted.mpc", "a8283a101878f3ca105f1f83f07e2c40", 386491),
Common::CZ_CZE,
Common::kPlatformWindows,
ADGF_NO_FLAGS,
@@ -234,11 +197,8 @@ static const TonyGameDescription gameDescriptions[] = {
{
"tony",
0,
- {
- {"roasted.mpr", 0, "06203dbbc85fdd1e6dc8fc211c1a6207", 135911071},
- {"roasted.mpc", 0, "57c4a3860cf899443c357e0078ea6f49", 366773},
- AD_LISTEND
- },
+ AD_ENTRY2s("roasted.mpr", "06203dbbc85fdd1e6dc8fc211c1a6207", 135911071,
+ "roasted.mpc", "57c4a3860cf899443c357e0078ea6f49", 366773),
Common::EN_ANY,
Common::kPlatformWindows,
ADGF_NO_FLAGS,
@@ -251,11 +211,8 @@ static const TonyGameDescription gameDescriptions[] = {
{
"tony",
0,
- {
- {"roasted.mpr", 0, "06203dbbc85fdd1e6dc8fc211c1a6207", 135911071},
- {"roasted.mpc", 0, "bc3471f098e591dc509dcad401a8d8a5", 389554},
- AD_LISTEND
- },
+ AD_ENTRY2s("roasted.mpr", "06203dbbc85fdd1e6dc8fc211c1a6207", 135911071,
+ "roasted.mpc", "bc3471f098e591dc509dcad401a8d8a5", 389554),
Common::EN_ANY,
Common::kPlatformWindows,
ADGF_NO_FLAGS,
@@ -268,11 +225,8 @@ static const TonyGameDescription gameDescriptions[] = {
{
"tony",
0,
- {
- {"roasted.mpr", 0, "06203dbbc85fdd1e6dc8fc211c1a6207", 135911071},
- {"roasted.mpc", 0, "377d6e24adeedc6c5c09c31b92231218", 391536},
- AD_LISTEND
- },
+ AD_ENTRY2s("roasted.mpr", "06203dbbc85fdd1e6dc8fc211c1a6207", 135911071,
+ "roasted.mpc", "377d6e24adeedc6c5c09c31b92231218", 391536),
Common::RU_RUS,
Common::kPlatformWindows,
ADGF_NO_FLAGS,
Commit: 7df2ef70e8b2b6d6e98b037701d4cb932b9817be
https://github.com/scummvm/scummvm/commit/7df2ef70e8b2b6d6e98b037701d4cb932b9817be
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-28T17:41:23+01:00
Commit Message:
TSAGE: Mark Spanish CD version of Blue Force as unsupported
Changed paths:
engines/tsage/POTFILES
engines/tsage/detection_tables.h
diff --git a/engines/tsage/POTFILES b/engines/tsage/POTFILES
index de18cbd072..25d88a6108 100644
--- a/engines/tsage/POTFILES
+++ b/engines/tsage/POTFILES
@@ -1,3 +1,3 @@
+engines/tsage/detection.cpp
engines/tsage/dialogs.cpp
engines/tsage/scenes.cpp
-
diff --git a/engines/tsage/detection_tables.h b/engines/tsage/detection_tables.h
index 1a61537c3e..9bcc67c49f 100644
--- a/engines/tsage/detection_tables.h
+++ b/engines/tsage/detection_tables.h
@@ -20,6 +20,8 @@
*
*/
+#include "common/translation.h"
+
namespace TsAGE {
static const tSageGameDescription gameDescriptions[] = {
@@ -140,23 +142,23 @@ static const tSageGameDescription gameDescriptions[] = {
GType_BlueForce,
GF_CD | GF_ALT_REGIONS
},
-#if 0
+
// Blue Force Spanish doesn't yet work
// Blue Force Spanish CD
{
{
"blueforce",
- "CD",
+ _s("Spanish CD version is not yet supported"),
AD_ENTRY1s("blue.rlb", "5b2b35c51b62e82d82b0791540bfae2d", 10082565),
Common::ES_ESP,
Common::kPlatformDOS,
- ADGF_CD | ADGF_UNSTABLE,
+ ADGF_CD | ADGF_UNSUPPORTED,
GUIO2(GUIO_NOSPEECH, GUIO_NOSFX)
},
GType_BlueForce,
GF_CD | GF_ALT_REGIONS
},
-#endif
+
// Return to Ringworld
{
{
Commit: e1f3b5e9a9e4028def962ba738db1e6ce5bd86aa
https://github.com/scummvm/scummvm/commit/e1f3b5e9a9e4028def962ba738db1e6ce5bd86aa
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-28T17:41:23+01:00
Commit Message:
ULTIMA: Use AD_ENTRY2s in the detection table
Changed paths:
engines/ultima/detection_tables.h
diff --git a/engines/ultima/detection_tables.h b/engines/ultima/detection_tables.h
index 6dca6ed7f4..36c7a8e09e 100644
--- a/engines/ultima/detection_tables.h
+++ b/engines/ultima/detection_tables.h
@@ -49,11 +49,8 @@ static const UltimaGameDescription GAME_DESCRIPTIONS[] = {
{
"ultima1",
0,
- {
- {"egctown.bin", 0, "4f7de68f6689cf9617aa1ea03240137e", 4896},
- {"map.bin", 0, "f99633a0110ccf90837ab161be56cf1c", 13104},
- AD_LISTEND
- },
+ AD_ENTRY2s("egctown.bin", "4f7de68f6689cf9617aa1ea03240137e", 4896,
+ "map.bin", "f99633a0110ccf90837ab161be56cf1c", 13104),
Common::JA_JPN,
Common::kPlatformPC98,
ADGF_UNSTABLE,
Commit: 9ea38c179f68620fc1a9518bb6bbc6040593946d
https://github.com/scummvm/scummvm/commit/9ea38c179f68620fc1a9518bb6bbc6040593946d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-28T17:41:23+01:00
Commit Message:
XEEN: Use macros in the detection tables
Changed paths:
engines/xeen/detection_tables.h
diff --git a/engines/xeen/detection_tables.h b/engines/xeen/detection_tables.h
index 34749ad03a..e26465d6d7 100644
--- a/engines/xeen/detection_tables.h
+++ b/engines/xeen/detection_tables.h
@@ -28,11 +28,8 @@ static const XeenGameDescription gameDescriptions[] = {
{
"worldofxeen",
nullptr,
- {
- { "xeen.cc", 0, "0cffbab533d9afe140e69ec93096f43e", 13435646 },
- { "dark.cc", 0, "df194483ecea6abc0511637d712ced7c", 11217676 },
- AD_LISTEND
- },
+ AD_ENTRY2s("xeen.cc", "0cffbab533d9afe140e69ec93096f43e", 13435646,
+ "dark.cc", "df194483ecea6abc0511637d712ced7c", 11217676),
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
@@ -67,11 +64,8 @@ static const XeenGameDescription gameDescriptions[] = {
{
"worldofxeen",
nullptr,
- {
- { "xeen.cc", 0, "f4e4b3ddc43bd102dbe1637f480f1fa1", 13214150 },
- { "dark.cc", 0, "84a86bbbc5f2fe96c0b0325485ed8203", 11168312 },
- AD_LISTEND
- },
+ AD_ENTRY2s("xeen.cc", "f4e4b3ddc43bd102dbe1637f480f1fa1", 13214150,
+ "dark.cc", "84a86bbbc5f2fe96c0b0325485ed8203", 11168312),
Common::DE_DEU,
Common::kPlatformDOS,
ADGF_UNSTABLE,
@@ -86,11 +80,8 @@ static const XeenGameDescription gameDescriptions[] = {
{
"worldofxeen",
"CD",
- {
- {"xeen.cc", 0, "964078c53f649937ce9a1a3596ce3d9f", 13438429},
- {"dark.cc", 0, "7f755ce39ea614fa6adb016f8bfc6e43", 11288403},
- AD_LISTEND
- },
+ AD_ENTRY2s("xeen.cc", "964078c53f649937ce9a1a3596ce3d9f", 13438429,
+ "dark.cc", "7f755ce39ea614fa6adb016f8bfc6e43", 11288403),
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_CD,
@@ -105,10 +96,7 @@ static const XeenGameDescription gameDescriptions[] = {
{
"cloudsofxeen",
nullptr,
- {
- { "xeen.cc", 0, "0cffbab533d9afe140e69ec93096f43e", 13435646 },
- AD_LISTEND
- },
+ AD_ENTRY1s("xeen.cc", "0cffbab533d9afe140e69ec93096f43e", 13435646),
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
@@ -123,10 +111,7 @@ static const XeenGameDescription gameDescriptions[] = {
{
"cloudsofxeen",
nullptr,
- {
- { "xeen.cc", 0, "f4e4b3ddc43bd102dbe1637f480f1fa1", 13214150 },
- AD_LISTEND
- },
+ AD_ENTRY1s("xeen.cc", "f4e4b3ddc43bd102dbe1637f480f1fa1", 13214150),
Common::DE_DEU,
Common::kPlatformDOS,
ADGF_UNSTABLE,
@@ -141,10 +126,7 @@ static const XeenGameDescription gameDescriptions[] = {
{
"darksideofxeen",
nullptr,
- {
- { "dark.cc", 0, "df194483ecea6abc0511637d712ced7c", 11217676 },
- AD_LISTEND
- },
+ AD_ENTRY1s("dark.cc", "df194483ecea6abc0511637d712ced7c", 11217676),
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
@@ -159,10 +141,7 @@ static const XeenGameDescription gameDescriptions[] = {
{
"darksideofxeen",
nullptr,
- {
- { "dark.cc", 0, "84a86bbbc5f2fe96c0b0325485ed8203", 11168312 },
- AD_LISTEND
- },
+ AD_ENTRY1s("dark.cc", "84a86bbbc5f2fe96c0b0325485ed8203", 11168312),
Common::DE_DEU,
Common::kPlatformDOS,
ADGF_UNSTABLE,
@@ -177,11 +156,8 @@ static const XeenGameDescription gameDescriptions[] = {
{
"darksideofxeen",
nullptr,
- {
- { "dark.cc", 0, "84a86bbbc5f2fe96c0b0325485ed8203", 11173657},
- { "intro.cc", 0, "e47a7ab0223cf32b2d87eed91d024c35", 8899953},
- AD_LISTEND
- },
+ AD_ENTRY2s("dark.cc", "84a86bbbc5f2fe96c0b0325485ed8203", 11173657,
+ "intro.cc", "e47a7ab0223cf32b2d87eed91d024c35", 8899953),
Common::DE_DEU,
Common::kPlatformDOS,
ADGF_UNSTABLE,
@@ -196,10 +172,7 @@ static const XeenGameDescription gameDescriptions[] = {
{
"swordsofxeen",
nullptr,
- {
- {"swrd.cc", 0, "0d51c3457070cc7d1a596da9241924a5", 13026924 },
- AD_LISTEND
- },
+ AD_ENTRY1s("swrd.cc", "0d51c3457070cc7d1a596da9241924a5", 13026924),
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
Commit: d3b00f006a3547d9e6c6ec47a9638e15f3fd926e
https://github.com/scummvm/scummvm/commit/d3b00f006a3547d9e6c6ec47a9638e15f3fd926e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-28T17:41:23+01:00
Commit Message:
ZVISION: Use AD_ENTRY2s in the detection table
Changed paths:
engines/zvision/detection_tables.h
diff --git a/engines/zvision/detection_tables.h b/engines/zvision/detection_tables.h
index 171df1f6ca..a9e7e1c6fe 100644
--- a/engines/zvision/detection_tables.h
+++ b/engines/zvision/detection_tables.h
@@ -118,11 +118,8 @@ static const ZVisionGameDescription gameDescriptions[] = {
{
"znemesis",
0,
- {
- { "CSCR.ZFS", 0, "f04113357b4748c13efcb58b4629887c", 2577873 },
- { "NEMESIS.STR", 0, "333bcb17bbb7f57cae742fbbe44f56f3", 9219 },
- AD_LISTEND
- },
+ AD_ENTRY2s("CSCR.ZFS", "f04113357b4748c13efcb58b4629887c", 2577873,
+ "NEMESIS.STR", "333bcb17bbb7f57cae742fbbe44f56f3", 9219),
Common::FR_FRA,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
@@ -136,11 +133,8 @@ static const ZVisionGameDescription gameDescriptions[] = {
{
"znemesis",
0,
- {
- { "CSCR.ZFS", 0, "f04113357b4748c13efcb58b4629887c", 2577873 },
- { "NEMESIS.STR", 0, "3d1a12b907751653866cffc6d4dfb331", 9505 },
- AD_LISTEND
- },
+ AD_ENTRY2s("CSCR.ZFS", "f04113357b4748c13efcb58b4629887c", 2577873,
+ "NEMESIS.STR", "3d1a12b907751653866cffc6d4dfb331", 9505),
Common::DE_DEU,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
@@ -154,11 +148,8 @@ static const ZVisionGameDescription gameDescriptions[] = {
{
"znemesis",
0,
- {
- { "CSCR.ZFS", 0, "f04113357b4748c13efcb58b4629887c", 2577873 },
- { "NEMESIS.STR", 0, "7c568feca8d9f9ae855c47183612c305", 9061 },
- AD_LISTEND
- },
+ AD_ENTRY2s("CSCR.ZFS", "f04113357b4748c13efcb58b4629887c", 2577873,
+ "NEMESIS.STR", "7c568feca8d9f9ae855c47183612c305", 9061),
Common::IT_ITA,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
Commit: a534bb122a72c9db8815b67e9ce9b8cc094da086
https://github.com/scummvm/scummvm/commit/a534bb122a72c9db8815b67e9ce9b8cc094da086
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-28T17:41:23+01:00
Commit Message:
MYST3: Mark PS2 versions as not supported
Changed paths:
engines/myst3/detection.cpp
diff --git a/engines/myst3/detection.cpp b/engines/myst3/detection.cpp
index 9781f6700b..bd0782743f 100644
--- a/engines/myst3/detection.cpp
+++ b/engines/myst3/detection.cpp
@@ -142,33 +142,33 @@ static const Myst3GameDescription gameDescriptions[] = {
// Myst 3 Xbox (RUS)
MYST3ENTRY_XBOX(Common::RU_RUS, "ENGLISHX.m3t", "18cb50f5c5317586a128ca9eb3e03279")
-// {
-// // Myst 3 PS2 (NTSC-U/C)
-// {
-// "myst3",
-// 0,
-// AD_ENTRY1s("RSRC.m3r", "c60d37bfd3bb8b0bee143018447bb460", 346618151),
-// Common::UNK_LANG,
-// Common::kPlatformPS2,
-// ADGF_UNSTABLE,
-// GUIO_NONE
-// },
-// kFlagDVD
-// },
-//
-// {
-// // Myst 3 PS2 (PAL)
-// {
-// "myst3",
-// 0,
-// AD_ENTRY1s("RSRC.m3r", "f0e0c502f77157e6b5272686c661ea75", 91371793),
-// Common::UNK_LANG,
-// Common::kPlatformPS2,
-// ADGF_UNSTABLE,
-// GUIO_NONE
-// },
-// kFlagDVD
-// },
+ {
+ // Myst 3 PS2 (NTSC-U/C)
+ {
+ "myst3",
+ _s("PS2 version is not yet supported"),
+ AD_ENTRY1s("RSRC.m3r", "c60d37bfd3bb8b0bee143018447bb460", 346618151),
+ Common::UNK_LANG,
+ Common::kPlatformPS2,
+ ADGF_UNSUPPORTED,
+ GUIO_NONE
+ },
+ 0
+ },
+
+ {
+ // Myst 3 PS2 (PAL)
+ {
+ "myst3",
+ _s("PS2 version is not yet supported"),
+ AD_ENTRY1s("RSRC.m3r", "f0e0c502f77157e6b5272686c661ea75", 91371793),
+ Common::UNK_LANG,
+ Common::kPlatformPS2,
+ ADGF_UNSUPPORTED,
+ GUIO_NONE
+ },
+ 0
+ },
{ AD_TABLE_END_MARKER, 0 }
};
Commit: 4b095ef4b9bba029cc54f2083c831d5b25214ab3
https://github.com/scummvm/scummvm/commit/4b095ef4b9bba029cc54f2083c831d5b25214ab3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-28T17:41:23+01:00
Commit Message:
COMMON: Added Sega Saturn as a platofrm
Changed paths:
common/platform.cpp
common/platform.h
diff --git a/common/platform.cpp b/common/platform.cpp
index 1beef44828..dfb7b4bb06 100644
--- a/common/platform.cpp
+++ b/common/platform.cpp
@@ -59,6 +59,7 @@ const PlatformDescription g_platforms[] = {
{ "beos", "beos", "beos", "BeOS", kPlatformBeOS },
{ "ppc", "ppc", "ppc", "PocketPC", kPlatformPocketPC },
{ "megadrive", "genesis", "md", "Mega Drive/Genesis", kPlatformMegaDrive },
+ { "saturn", "saturn", "saturn", "Sega Saturn", kPlatformSaturn },
{ nullptr, nullptr, nullptr, "Default", kPlatformUnknown }
};
diff --git a/common/platform.h b/common/platform.h
index f9a3b8dedb..b55aabdb76 100644
--- a/common/platform.h
+++ b/common/platform.h
@@ -72,6 +72,7 @@ enum Platform {
kPlatformBeOS,
kPlatformPocketPC,
kPlatformMegaDrive,
+ kPlatformSaturn,
kPlatformUnknown = -1
};
Commit: 279a277bb30e459cbedbc6867d66fbfdd1141ddb
https://github.com/scummvm/scummvm/commit/279a277bb30e459cbedbc6867d66fbfdd1141ddb
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-28T17:41:24+01:00
Commit Message:
TINSEL: Marked Saturn DW1 as unsupported
Changed paths:
engines/tinsel/detection_tables.h
diff --git a/engines/tinsel/detection_tables.h b/engines/tinsel/detection_tables.h
index 0bcb023086..69b9555576 100644
--- a/engines/tinsel/detection_tables.h
+++ b/engines/tinsel/detection_tables.h
@@ -459,27 +459,22 @@ static const TinselGameDescription gameDescriptions[] = {
TINSEL_V1,
},
-#if 0
{ // English Saturn CD
{
"dw",
- "CD",
- {
- {"dw.scn", 0, "6803f293c88758057cc685b9437f7637", 382248},
- {"english.smp", 0, NULL, -1},
- AD_LISTEND
- },
+ "Saturn CD version is not yet supported",
+ AD_ENTRY2s("dw.scn", "6803f293c88758057cc685b9437f7637", 382248,
+ "english.smp", NULL, -1),
Common::EN_ANY,
- Common::kPlatformDOS,
+ Common::kPlatformSaturn,
ADGF_CD,
GUIO0()
},
GID_DW1,
0,
- GF_SCNFILES | GF_ENHANCED_AUDIO_SUPPORT,
+ GF_SCNFILES | GF_ENHANCED_AUDIO_SUPPORT | ADGF_UNSUPPORTED,
TINSEL_V1,
},
-#endif
{ // Mac English CD, see tracker #3614864
{
Commit: 7d9b2c7d4ec23baabc4462c34e06a19ca54442ac
https://github.com/scummvm/scummvm/commit/7d9b2c7d4ec23baabc4462c34e06a19ca54442ac
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-28T17:41:24+01:00
Commit Message:
SAGA: Give clarification to the user why certain versions of ITE are not supported
Changed paths:
engines/saga/POTFILES
engines/saga/detection_tables.h
diff --git a/engines/saga/POTFILES b/engines/saga/POTFILES
index cec3193f11..b5670b07aa 100644
--- a/engines/saga/POTFILES
+++ b/engines/saga/POTFILES
@@ -1 +1,2 @@
+engines/saga/detection_tables.h
engines/saga/saga.cpp
diff --git a/engines/saga/detection_tables.h b/engines/saga/detection_tables.h
index 44e2339ca4..3b16c85c30 100644
--- a/engines/saga/detection_tables.h
+++ b/engines/saga/detection_tables.h
@@ -22,6 +22,8 @@
// Game detection information and MD5s
+#include "common/translation.h"
+
// From sage/scene.h, these are some defines that also
// help with detection.
#include "saga/shared_detection_defines.h"
@@ -174,7 +176,6 @@ static const SAGAGameDescription gameDescriptions[] = {
// ITE Demos //////////////////////////////////////////////////////////////////////////////////////////////
-#if 0
// Note: This version is NOT supported yet
// Based on a very early version of the engine
@@ -183,7 +184,7 @@ static const SAGAGameDescription gameDescriptions[] = {
{
{
"ite",
- "Demo", // Game title
+ _s("Missing game code"), // Reason for being unsupported
{
{"ite.rsc", GAME_RESOURCEFILE, "986c79c4d2939dbe555576529fd37932", -1},
//{"ite.dmo", GAME_DEMOFILE, "0b9a70eb4e120b6f00579b46c8cae29e", -1},
@@ -193,7 +194,7 @@ static const SAGAGameDescription gameDescriptions[] = {
},
Common::EN_ANY,
Common::kPlatformDOS,
- ADGF_DEMO,
+ ADGF_DEMO | ADGF_UNSUPPORTED,
GUIO1(GUIO_NOSPEECH)
},
GID_ITE,
@@ -204,7 +205,6 @@ static const SAGAGameDescription gameDescriptions[] = {
ITEDEMO_GameFonts,
NULL,
},
-#endif
// Inherit the earth - MAC Demo version
{
@@ -599,14 +599,13 @@ static const SAGAGameDescription gameDescriptions[] = {
NULL,
},
-#if 0
// Inherit the earth - Windows Trial
// Not supported and will not be supported, as fixing it
// enables whole game. Currently, it crashes.
{
{
"ite",
- "Trial/Not supported",
+ _s("Missing game code"),
{
{"ite.rsc", GAME_RESOURCEFILE, "a6433e34b97b15e64fe8214651012db9", 8927169},
{"scripts.rsc", GAME_SCRIPTFILE, "bbf929f1e6d6f2af30c41d078798f5c1", 335927},
@@ -614,7 +613,7 @@ static const SAGAGameDescription gameDescriptions[] = {
},
Common::EN_ANY,
Common::kPlatformWindows,
- ADGF_CD,
+ ADGF_CD | ADGF_UNSUPPORTED,
GUIO0()
},
GID_ITE,
@@ -625,7 +624,6 @@ static const SAGAGameDescription gameDescriptions[] = {
ITE_GameFonts,
NULL,
},
-#endif
// Inherit the Earth - Japanese PC-98 CD version
{
Commit: 092886fcb3dd1425782dc8e87cddffe8f0193d52
https://github.com/scummvm/scummvm/commit/092886fcb3dd1425782dc8e87cddffe8f0193d52
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-28T17:41:24+01:00
Commit Message:
I18N: Clarify files in POTFILES
Changed paths:
engines/made/POTFILES
engines/tsage/POTFILES
diff --git a/engines/made/POTFILES b/engines/made/POTFILES
index 7c70735d00..c30a1ca69d 100644
--- a/engines/made/POTFILES
+++ b/engines/made/POTFILES
@@ -1 +1 @@
-engines/made/detection.cpp
+engines/made/detection_tables.h
diff --git a/engines/tsage/POTFILES b/engines/tsage/POTFILES
index 25d88a6108..8fc9800969 100644
--- a/engines/tsage/POTFILES
+++ b/engines/tsage/POTFILES
@@ -1,3 +1,3 @@
-engines/tsage/detection.cpp
+engines/tsage/detection_tables.h
engines/tsage/dialogs.cpp
engines/tsage/scenes.cpp
More information about the Scummvm-git-logs
mailing list