[Scummvm-git-logs] scummvm master -> a2d62b46b51dbab9f3d59eb300992951db1e3dd6
sev-
sev at scummvm.org
Sat Nov 28 14:24:39 UTC 2020
This automated email contains information about 19 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
2a317b611d ADL: Use macros in detection tables
cd7ca4db99 AGI: Use AD_ENTRY2s in detection table
ae27bc6133 AGOS: JANITORIAL: Whitespace fixes
bb3a9d75bd AVALANCHE: Use AD_ENTRY2s
53cd3e42de CGE: Use AD_ENTRY2s in detection
a1557341b3 CGE: Use ADGF_UNSUPPORTED for demos
09249f7ef2 CGE2: Use AD_ENTRY2s in detection table
e4f1351d05 CINE: Use AD_ENTRY2s in the detection tables
0e2cc2f661 DIRECTOR: Use AD_ENTRY2s in the detection table
4644b00011 DM: Use AD_ENTRY2s in detection table
10793ed9fa DRAGONS: Use AD_ENTRY2s in the detection table
e804ba69a7 DREAMWEB: Use AD_ENTRY2s in the detection tables
db6f4ce9ae GNAP: Use macros in detection tables
e875632acc GOB: Use AD_ENTRY2s in the detection tables
9e73c49e2b GRIM: Use AD_ENTRY2s in the detection table. That also fixes OOB access
6b48712d1d GROOVIE: Use AD_ENTRY2s in the detection tables
eb6d80b4eb HOPKINS: Use macros in the detection tables
c6ca91ba44 KYRA: Use macros in detection tables
a2d62b46b5 KYRA: Fix OOB access in the detection table
Commit: 2a317b611db7170f199be9ed6e1d5a58855aafb3
https://github.com/scummvm/scummvm/commit/2a317b611db7170f199be9ed6e1d5a58855aafb3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-28T13:18:19+01:00
Commit Message:
ADL: Use macros in detection tables
Changed paths:
engines/adl/detection.cpp
diff --git a/engines/adl/detection.cpp b/engines/adl/detection.cpp
index e175144bf2..a7858bc73a 100644
--- a/engines/adl/detection.cpp
+++ b/engines/adl/detection.cpp
@@ -166,10 +166,7 @@ static const AdlGameDescription gameDiskDescriptions[] = {
{ // Hi-Res Adventure #1: Mystery House - Apple II - Contains Coarsegold address
{
"hires1", "",
- {
- { "mysthous", 0, "8df0b3b3e609a2e40237e2419c1cb767", 116480 },
- AD_LISTEND
- },
+ AD_ENTRY1s("mysthous", "8df0b3b3e609a2e40237e2419c1cb767", 116480),
Common::EN_ANY,
Common::kPlatformApple2,
ADGF_NO_FLAGS,
@@ -181,10 +178,7 @@ static const AdlGameDescription gameDiskDescriptions[] = {
{ // Hi-Res Adventure #1: Mystery House - Apple II - Roberta Williams Anthology
{
"hires1", "",
- {
- { "mysthous", 0, "54d20eb1ef0084ac3c2d16c31c5b7eb7", 143360 },
- AD_LISTEND
- },
+ AD_ENTRY1s("mysthous", "54d20eb1ef0084ac3c2d16c31c5b7eb7", 143360),
Common::EN_ANY,
Common::kPlatformApple2,
ADGF_NO_FLAGS,
@@ -196,10 +190,7 @@ static const AdlGameDescription gameDiskDescriptions[] = {
{ // Hi-Res Adventure #2: Wizard and the Princess - Apple II - Roberta Williams Anthology
{
"hires2", "",
- {
- { "wizard", 0, "72b114bf8f94fafe5672daac2a70c765", 143360 },
- AD_LISTEND
- },
+ AD_ENTRY1s("wizard", "72b114bf8f94fafe5672daac2a70c765", 143360),
Common::EN_ANY,
Common::kPlatformApple2,
ADGF_NO_FLAGS,
@@ -211,10 +202,7 @@ static const AdlGameDescription gameDiskDescriptions[] = {
{ // Hi-Res Adventure #0: Mission Asteroid - Apple II - Roberta Williams Anthology
{
"hires0", "",
- {
- { "mission", 0, "6bc53f51a3c8ee65c020af55fb8bd875", 116480 },
- AD_LISTEND
- },
+ AD_ENTRY1s("mission", "6bc53f51a3c8ee65c020af55fb8bd875", 116480),
Common::EN_ANY,
Common::kPlatformApple2,
ADGF_NO_FLAGS,
@@ -226,10 +214,7 @@ static const AdlGameDescription gameDiskDescriptions[] = {
{ // Hi-Res Adventure #3: Cranston Manor - Apple II
{
"hires3", "",
- {
- { "cranston", 0, "e4d35440791a36e55299c7be1ccd2b04", 116480 },
- AD_LISTEND
- },
+ AD_ENTRY1s("cranston", "e4d35440791a36e55299c7be1ccd2b04", 116480),
Common::EN_ANY,
Common::kPlatformApple2,
ADGF_NO_FLAGS,
Commit: cd7ca4db99892781d672223044d4aca69376f671
https://github.com/scummvm/scummvm/commit/cd7ca4db99892781d672223044d4aca69376f671
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-28T13:21:00+01:00
Commit Message:
AGI: Use AD_ENTRY2s in detection table
Changed paths:
engines/agi/detection_tables.h
diff --git a/engines/agi/detection_tables.h b/engines/agi/detection_tables.h
index d99b55e995..cf0475e0d4 100644
--- a/engines/agi/detection_tables.h
+++ b/engines/agi/detection_tables.h
@@ -290,11 +290,8 @@ static const AGIGameDescription gameDescriptions[] = {
{
"goldrush",
"2.01 1988-12-22",
- {
- { "grdir", 0, "db733d199238d4009a9e95f11ece34e9", 2399},
- { "vol.0", 0, "4b6423d143674d3757ab1b875d25951d", 25070},
- AD_LISTEND
- },
+ AD_ENTRY2s("grdir", "db733d199238d4009a9e95f11ece34e9", 2399,
+ "vol.0", "4b6423d143674d3757ab1b875d25951d", 25070),
Common::EN_ANY,
Common::kPlatformMacintosh,
ADGF_NO_FLAGS,
@@ -613,11 +610,8 @@ static const AGIGameDescription gameDescriptions[] = {
{
"sq2",
"2.0F 1986-12-09 [VOL.2->PICTURE.16 broken]",
- {
- { "logdir", 0, "28add5125484302d213911df60d2aded", 426},
- { "object", 0, "5dc52be721257719f4b311a84ce22b16", 372},
- AD_LISTEND
- },
+ AD_ENTRY2s("logdir", "28add5125484302d213911df60d2aded", 426,
+ "object", "5dc52be721257719f4b311a84ce22b16", 372),
Common::EN_ANY,
Common::kPlatformAmiga,
ADGF_NO_FLAGS,
Commit: ae27bc61336f7f0bb2ce216376de839ae9bb361b
https://github.com/scummvm/scummvm/commit/ae27bc61336f7f0bb2ce216376de839ae9bb361b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-28T13:27:37+01:00
Commit Message:
AGOS: JANITORIAL: Whitespace fixes
Changed paths:
engines/agos/detection_tables.h
diff --git a/engines/agos/detection_tables.h b/engines/agos/detection_tables.h
index d60f23e9a1..46e80851d3 100644
--- a/engines/agos/detection_tables.h
+++ b/engines/agos/detection_tables.h
@@ -232,8 +232,8 @@ static const AGOSGameDescription gameDescriptions[] = {
{
{ "gamest", GAME_BASEFILE, "8942859018fcfb2dbed13e83d974d1ab", -1},
- { "icon.dat", GAME_ICONFILE, "2db931e84f1ca01f0816dddfae3f49e1", -1},
- { "tbllist", GAME_TBLFILE, "5b6ff494bf7e24213758598ef4ac0a8b", -1},
+ { "icon.dat", GAME_ICONFILE, "2db931e84f1ca01f0816dddfae3f49e1", -1},
+ { "tbllist", GAME_TBLFILE, "5b6ff494bf7e24213758598ef4ac0a8b", -1},
AD_LISTEND
},
Common::EN_ANY,
@@ -255,8 +255,8 @@ static const AGOSGameDescription gameDescriptions[] = {
{
{ "gamest", GAME_BASEFILE, "ce2100ba71284f55ac302847d7f94747", 119851},
- { "icon.dat", GAME_ICONFILE, "2db931e84f1ca01f0816dddfae3f49e1", 36573},
- { "tbllist", GAME_TBLFILE, "5b6ff494bf7e24213758598ef4ac0a8b", 476},
+ { "icon.dat", GAME_ICONFILE, "2db931e84f1ca01f0816dddfae3f49e1", 36573},
+ { "tbllist", GAME_TBLFILE, "5b6ff494bf7e24213758598ef4ac0a8b", 476},
AD_LISTEND
},
Common::EN_ANY,
@@ -278,8 +278,8 @@ static const AGOSGameDescription gameDescriptions[] = {
{
{ "demo", GAME_BASEFILE, "54b43b6ab38964bd7fd17e9f1b41cc64", 2308},
- { "icon.dat", GAME_ICONFILE, "55d8dd70c54340397ca518665274a477", 576},
- { "tbllist", GAME_TBLFILE, "319f6b227c7822a551f57d24e70f8149", 368},
+ { "icon.dat", GAME_ICONFILE, "55d8dd70c54340397ca518665274a477", 576},
+ { "tbllist", GAME_TBLFILE, "319f6b227c7822a551f57d24e70f8149", 368},
AD_LISTEND
},
Common::EN_ANY,
@@ -301,8 +301,8 @@ static const AGOSGameDescription gameDescriptions[] = {
{
{ "gamepc", GAME_BASEFILE, "a49e132a1f18306dd5d1ec2fe435e178", 135332},
- { "icon.dat", GAME_ICONFILE, "fda48c9da7f3e72d0313e2f5f760fc45", 56448},
- { "tbllist", GAME_TBLFILE, "319f6b227c7822a551f57d24e70f8149", 368},
+ { "icon.dat", GAME_ICONFILE, "fda48c9da7f3e72d0313e2f5f760fc45", 56448},
+ { "tbllist", GAME_TBLFILE, "319f6b227c7822a551f57d24e70f8149", 368},
AD_LISTEND
},
Common::EN_ANY,
@@ -324,8 +324,8 @@ static const AGOSGameDescription gameDescriptions[] = {
{
{ "gamepc", GAME_BASEFILE, "97d2f74db08845c43474312a87330cf6", 137361},
- { "icon.dat", GAME_ICONFILE, "fda48c9da7f3e72d0313e2f5f760fc45", 56448},
- { "tbllist", GAME_TBLFILE, "319f6b227c7822a551f57d24e70f8149", 368},
+ { "icon.dat", GAME_ICONFILE, "fda48c9da7f3e72d0313e2f5f760fc45", 56448},
+ { "tbllist", GAME_TBLFILE, "319f6b227c7822a551f57d24e70f8149", 368},
AD_LISTEND
},
Common::ES_ESP,
@@ -347,8 +347,8 @@ static const AGOSGameDescription gameDescriptions[] = {
{
{ "gamepc", GAME_BASEFILE, "9076d507d60cc454df662316438ec843", -1},
- { "icon.dat", GAME_ICONFILE, "fda48c9da7f3e72d0313e2f5f760fc45", -1},
- { "tbllist", GAME_TBLFILE, "319f6b227c7822a551f57d24e70f8149", -1},
+ { "icon.dat", GAME_ICONFILE, "fda48c9da7f3e72d0313e2f5f760fc45", -1},
+ { "tbllist", GAME_TBLFILE, "319f6b227c7822a551f57d24e70f8149", -1},
AD_LISTEND
},
Common::FR_FRA,
@@ -370,8 +370,8 @@ static const AGOSGameDescription gameDescriptions[] = {
{
{ "gamepc", GAME_BASEFILE, "d0b593143e21fc150c044819df2c0b98", -1},
- { "icon.dat", GAME_ICONFILE, "fda48c9da7f3e72d0313e2f5f760fc45", -1},
- { "tbllist", GAME_TBLFILE, "319f6b227c7822a551f57d24e70f8149", -1},
+ { "icon.dat", GAME_ICONFILE, "fda48c9da7f3e72d0313e2f5f760fc45", -1},
+ { "tbllist", GAME_TBLFILE, "319f6b227c7822a551f57d24e70f8149", -1},
AD_LISTEND
},
Common::DE_DEU,
@@ -395,7 +395,7 @@ static const AGOSGameDescription gameDescriptions[] = {
{ "gameamiga", GAME_BASEFILE, "4aa163967f5d2bd319f8350d6af03186", 134799},
{ "icon.dat", GAME_ICONFILE, "a88b1c02e13ab04dd790ec30502c323d", 69860},
{ "menus.dat", GAME_MENUFILE, "a2fdc88a77c8bdffec6b36cbeda4d955", 108},
- { "start", GAME_RESTFILE, "a9f876c6c66dfd011b971da3dc7b4ada", 27752},
+ { "start", GAME_RESTFILE, "a9f876c6c66dfd011b971da3dc7b4ada", 27752},
{ "stripped.txt", GAME_STRFILE, "41c975a9c1106cb5298a0bc3df0a266e", 72},
{ "tbllist", GAME_TBLFILE, "177f5f2640e80ef92d1421d32de06a5e", 272},
AD_LISTEND
@@ -421,7 +421,7 @@ static const AGOSGameDescription gameDescriptions[] = {
{ "gameamiga", GAME_BASEFILE, "7bb91fd61a135243b18b74b51ebca6bf", -1},
{ "icon.dat", GAME_ICONFILE, "a88b1c02e13ab04dd790ec30502c323d", -1},
{ "menus.dat", GAME_MENUFILE, "a2fdc88a77c8bdffec6b36cbeda4d955", -1},
- { "start", GAME_RESTFILE, "a9f876c6c66dfd011b971da3dc7b4ada", -1},
+ { "start", GAME_RESTFILE, "a9f876c6c66dfd011b971da3dc7b4ada", -1},
{ "stripped.txt", GAME_STRFILE, "41c975a9c1106cb5298a0bc3df0a266e", -1},
{ "tbllist", GAME_TBLFILE, "177f5f2640e80ef92d1421d32de06a5e", -1},
AD_LISTEND
@@ -449,7 +449,7 @@ static const AGOSGameDescription gameDescriptions[] = {
{ "gameamiga", GAME_BASEFILE, "7af80eb9759bcafcd8df21e61c5af200", -1},
{ "icon.dat", GAME_ICONFILE, "a88b1c02e13ab04dd790ec30502c323d", -1},
{ "tbllist", GAME_TBLFILE, "177f5f2640e80ef92d1421d32de06a5e", -1},
- { "start", GAME_RESTFILE, "a9f876c6c66dfd011b971da3dc7b4ada", -1},
+ { "start", GAME_RESTFILE, "a9f876c6c66dfd011b971da3dc7b4ada", -1},
AD_LISTEND
},
Common::DE_DEU,
@@ -473,7 +473,7 @@ static const AGOSGameDescription gameDescriptions[] = {
{ "gameamiga", GAME_BASEFILE, "3d4e0c8da4ebd222e50de2dffed92955", 139505},
{ "icon.dat", GAME_ICONFILE, "a88b1c02e13ab04dd790ec30502c323d", 69860},
{ "menus.dat", GAME_MENUFILE, "a2fdc88a77c8bdffec6b36cbeda4d955", 108},
- { "start", GAME_RESTFILE, "a9f876c6c66dfd011b971da3dc7b4ada", 27752},
+ { "start", GAME_RESTFILE, "a9f876c6c66dfd011b971da3dc7b4ada", 27752},
{ "stripped.txt", GAME_STRFILE, "41c975a9c1106cb5298a0bc3df0a266e", 72},
{ "tbllist", GAME_TBLFILE, "177f5f2640e80ef92d1421d32de06a5e", 272},
AD_LISTEND
@@ -499,7 +499,7 @@ static const AGOSGameDescription gameDescriptions[] = {
{ "gameamiga", GAME_BASEFILE, "fddfac048a759c84ecf96e3d0cb368cc", 139126},
{ "icon.dat", GAME_ICONFILE, "a88b1c02e13ab04dd790ec30502c323d", 69860},
{ "menus.dat", GAME_MENUFILE, "a2fdc88a77c8bdffec6b36cbeda4d955", 108},
- { "start", GAME_RESTFILE, "a9f876c6c66dfd011b971da3dc7b4ada", 27752},
+ { "start", GAME_RESTFILE, "a9f876c6c66dfd011b971da3dc7b4ada", 27752},
{ "stripped.txt", GAME_STRFILE, "41c975a9c1106cb5298a0bc3df0a266e", 72},
{ "tbllist", GAME_TBLFILE, "177f5f2640e80ef92d1421d32de06a5e", 272},
AD_LISTEND
@@ -522,10 +522,10 @@ static const AGOSGameDescription gameDescriptions[] = {
"Floppy",
{
- { "gamest", GAME_BASEFILE, "1b1acd637d32bee79859b7cc9de070e7", -1},
+ { "gamest", GAME_BASEFILE, "1b1acd637d32bee79859b7cc9de070e7", -1},
{ "icon.dat", GAME_ICONFILE, "9a4eaf4df0cdf5cc85a5134150f96589", -1},
{ "menus.dat", GAME_MENUFILE, "a2fdc88a77c8bdffec6b36cbeda4d955", -1},
- { "start", GAME_RESTFILE, "8cddf461f418ea12f711fda3d3dd62fe", -1},
+ { "start", GAME_RESTFILE, "8cddf461f418ea12f711fda3d3dd62fe", -1},
{ "stripped.txt", GAME_STRFILE, "41c975a9c1106cb5298a0bc3df0a266e", -1},
{ "tbllist", GAME_TBLFILE, "177f5f2640e80ef92d1421d32de06a5e", -1},
AD_LISTEND
@@ -548,10 +548,10 @@ static const AGOSGameDescription gameDescriptions[] = {
"Floppy",
{
- { "gamest", GAME_BASEFILE, "7bb91fd61a135243b18b74b51ebca6bf", -1},
+ { "gamest", GAME_BASEFILE, "7bb91fd61a135243b18b74b51ebca6bf", -1},
{ "icon.dat", GAME_ICONFILE, "9a4eaf4df0cdf5cc85a5134150f96589", -1},
{ "menus.dat", GAME_MENUFILE, "a2fdc88a77c8bdffec6b36cbeda4d955", -1},
- { "start", GAME_RESTFILE, "8cddf461f418ea12f711fda3d3dd62fe", -1},
+ { "start", GAME_RESTFILE, "8cddf461f418ea12f711fda3d3dd62fe", -1},
{ "stripped.txt", GAME_STRFILE, "41c975a9c1106cb5298a0bc3df0a266e", -1},
{ "tbllist", GAME_TBLFILE, "177f5f2640e80ef92d1421d32de06a5e", -1},
AD_LISTEND
@@ -575,10 +575,10 @@ static const AGOSGameDescription gameDescriptions[] = {
"Floppy",
{
- { "gamepc", GAME_BASEFILE, "3313254722031b22d833a2cf45a91fd7", 125702},
+ { "gamepc", GAME_BASEFILE, "3313254722031b22d833a2cf45a91fd7", 125702},
{ "icon.dat", GAME_ICONFILE, "83a7278bff55c82fbb3aef92981866c9", 54471},
{ "menus.dat", GAME_MENUFILE, "a2fdc88a77c8bdffec6b36cbeda4d955", 108},
- { "start", GAME_RESTFILE, "4d380a35ba941d03ee5084c71d20055b", 27876},
+ { "start", GAME_RESTFILE, "4d380a35ba941d03ee5084c71d20055b", 27876},
{ "stripped.txt", GAME_STRFILE, "c2533277b7ff11f5495967d55355ea17", 81},
{ "tbllist", GAME_TBLFILE, "8252660df0edbdbc3e6377e155bbd0c5", 284},
AD_LISTEND
@@ -601,10 +601,10 @@ static const AGOSGameDescription gameDescriptions[] = {
"Floppy",
{
- { "gamepc", GAME_BASEFILE, "1282fd5c520861ae2b73bf653afef547", -1},
+ { "gamepc", GAME_BASEFILE, "1282fd5c520861ae2b73bf653afef547", -1},
{ "icon.dat", GAME_ICONFILE, "83a7278bff55c82fbb3aef92981866c9", -1},
{ "menus.dat", GAME_MENUFILE, "a2fdc88a77c8bdffec6b36cbeda4d955", -1},
- { "start", GAME_RESTFILE, "4d380a35ba941d03ee5084c71d20055b", -1},
+ { "start", GAME_RESTFILE, "4d380a35ba941d03ee5084c71d20055b", -1},
{ "stripped.txt", GAME_STRFILE, "c2533277b7ff11f5495967d55355ea17", -1},
{ "tbllist", GAME_TBLFILE, "8252660df0edbdbc3e6377e155bbd0c5", -1},
AD_LISTEND
@@ -627,10 +627,10 @@ static const AGOSGameDescription gameDescriptions[] = {
"Floppy",
{
- { "gamepc", GAME_BASEFILE, "75d814739585b6fa89a025045885e3b9", 125665},
+ { "gamepc", GAME_BASEFILE, "75d814739585b6fa89a025045885e3b9", 125665},
{ "icon.dat", GAME_ICONFILE, "83a7278bff55c82fbb3aef92981866c9", 54471},
{ "menus.dat", GAME_MENUFILE, "a2fdc88a77c8bdffec6b36cbeda4d955", 108},
- { "start", GAME_RESTFILE, "016107aced82d0cc5d758a9fba716270", 27852},
+ { "start", GAME_RESTFILE, "016107aced82d0cc5d758a9fba716270", 27852},
{ "stripped.txt", GAME_STRFILE, "c3a8f644551a27c8a2fec0f8070b46b7", 81},
{ "tbllist", GAME_TBLFILE, "8252660df0edbdbc3e6377e155bbd0c5", 284},
AD_LISTEND
@@ -653,10 +653,10 @@ static const AGOSGameDescription gameDescriptions[] = {
"Floppy",
{
- { "gamepc", GAME_BASEFILE, "4bf28ab00f5324fd938e632595742382", 130980},
+ { "gamepc", GAME_BASEFILE, "4bf28ab00f5324fd938e632595742382", 130980},
{ "icon.dat", GAME_ICONFILE, "83a7278bff55c82fbb3aef92981866c9", 54471},
{ "menus.dat", GAME_MENUFILE, "a2fdc88a77c8bdffec6b36cbeda4d955", 108},
- { "start", GAME_RESTFILE, "016107aced82d0cc5d758a9fba716270", 27852},
+ { "start", GAME_RESTFILE, "016107aced82d0cc5d758a9fba716270", 27852},
{ "stripped.txt", GAME_STRFILE, "c3a8f644551a27c8a2fec0f8070b46b7", 81},
{ "tbllist", GAME_TBLFILE, "8252660df0edbdbc3e6377e155bbd0c5", 284},
AD_LISTEND
@@ -679,10 +679,10 @@ static const AGOSGameDescription gameDescriptions[] = {
"Floppy",
{
- { "gamepc", GAME_BASEFILE, "d1979d2fbc5fb5276563578ca55cbcec", -1},
+ { "gamepc", GAME_BASEFILE, "d1979d2fbc5fb5276563578ca55cbcec", -1},
{ "icon.dat", GAME_ICONFILE, "83a7278bff55c82fbb3aef92981866c9", -1},
{ "menus.dat", GAME_MENUFILE, "a2fdc88a77c8bdffec6b36cbeda4d955", -1},
- { "start", GAME_RESTFILE, "016107aced82d0cc5d758a9fba716270", -1},
+ { "start", GAME_RESTFILE, "016107aced82d0cc5d758a9fba716270", -1},
{ "stripped.txt", GAME_STRFILE, "c3a8f644551a27c8a2fec0f8070b46b7", -1},
{ "tbllist", GAME_TBLFILE, "8252660df0edbdbc3e6377e155bbd0c5", -1},
AD_LISTEND
@@ -705,10 +705,10 @@ static const AGOSGameDescription gameDescriptions[] = {
"Floppy",
{
- { "gamepc", GAME_BASEFILE, "09a3f1087f2977ff462ad2417bde0a5c", 129833},
+ { "gamepc", GAME_BASEFILE, "09a3f1087f2977ff462ad2417bde0a5c", 129833},
{ "icon.dat", GAME_ICONFILE, "83a7278bff55c82fbb3aef92981866c9", 54471},
{ "menus.dat", GAME_MENUFILE, "a2fdc88a77c8bdffec6b36cbeda4d955", 108},
- { "start", GAME_RESTFILE, "016107aced82d0cc5d758a9fba716270", 27852},
+ { "start", GAME_RESTFILE, "016107aced82d0cc5d758a9fba716270", 27852},
{ "stripped.txt", GAME_STRFILE, "c3a8f644551a27c8a2fec0f8070b46b7", 81},
{ "tbllist", GAME_TBLFILE, "8252660df0edbdbc3e6377e155bbd0c5", 284},
AD_LISTEND
@@ -731,10 +731,10 @@ static const AGOSGameDescription gameDescriptions[] = {
"Floppy",
{
- { "gamepc", GAME_BASEFILE, "bfcd74d704ad481d75eb6ba5b828333a", 129577},
+ { "gamepc", GAME_BASEFILE, "bfcd74d704ad481d75eb6ba5b828333a", 129577},
{ "icon.dat", GAME_ICONFILE, "83a7278bff55c82fbb3aef92981866c9", 54471},
{ "menus.dat", GAME_MENUFILE, "a2fdc88a77c8bdffec6b36cbeda4d955", 108},
- { "start", GAME_RESTFILE, "016107aced82d0cc5d758a9fba716270", 27852},
+ { "start", GAME_RESTFILE, "016107aced82d0cc5d758a9fba716270", 27852},
{ "stripped.txt", GAME_STRFILE, "c3a8f644551a27c8a2fec0f8070b46b7", 81},
{ "tbllist", GAME_TBLFILE, "8252660df0edbdbc3e6377e155bbd0c5", 284},
AD_LISTEND
@@ -757,10 +757,10 @@ static const AGOSGameDescription gameDescriptions[] = {
"Floppy",
{
- { "gamepc", GAME_BASEFILE, "e84e1ac84f63d9a39270e517196c5ff9", 129577},
+ { "gamepc", GAME_BASEFILE, "e84e1ac84f63d9a39270e517196c5ff9", 129577},
{ "icon.dat", GAME_ICONFILE, "83a7278bff55c82fbb3aef92981866c9", 54471},
{ "menus.dat", GAME_MENUFILE, "a2fdc88a77c8bdffec6b36cbeda4d955", 108},
- { "start", GAME_RESTFILE, "016107aced82d0cc5d758a9fba716270", 27852},
+ { "start", GAME_RESTFILE, "016107aced82d0cc5d758a9fba716270", 27852},
{ "stripped.txt", GAME_STRFILE, "c3a8f644551a27c8a2fec0f8070b46b7", 81},
{ "tbllist", GAME_TBLFILE, "8252660df0edbdbc3e6377e155bbd0c5", 284},
AD_LISTEND
@@ -786,7 +786,7 @@ static const AGOSGameDescription gameDescriptions[] = {
{ "gameamiga", GAME_BASEFILE, "eca24fe7c3e005caca47cecac56f7245", 43392},
{ "icon.pkd", GAME_ICONFILE, "4822a91c18b1b2005ac17fc617f7dcbe", 18940},
{ "menus.dat", GAME_MENUFILE, "3409eeb8ca8b46fc04da99de67573f5e", 320},
- { "start", GAME_RESTFILE, "b575b336e741dde1725edd4079d5ab67", 20902},
+ { "start", GAME_RESTFILE, "b575b336e741dde1725edd4079d5ab67", 20902},
{ "stripped.txt", GAME_STRFILE, "6faaebff2786216900061eeb978f10af", 225},
{ "tbllist", GAME_TBLFILE, "95c44bfc380770a6b6dd0dfcc69e80a0", 309},
{ "xtbllist", GAME_XTBLFILE, "6c7b3db345d46349a5226f695c03e20f", 88},
@@ -813,7 +813,7 @@ static const AGOSGameDescription gameDescriptions[] = {
{ "gameamiga", GAME_BASEFILE, "2938a17103de603c4c6f05e6a433b365", 44640},
{ "icon.pkd", GAME_ICONFILE, "4822a91c18b1b2005ac17fc617f7dcbe", 18940},
{ "menus.dat", GAME_MENUFILE, "3409eeb8ca8b46fc04da99de67573f5e", 320},
- { "start", GAME_RESTFILE, "b575b336e741dde1725edd4079d5ab67", 20902},
+ { "start", GAME_RESTFILE, "b575b336e741dde1725edd4079d5ab67", 20902},
{ "stripped.txt", GAME_STRFILE, "6faaebff2786216900061eeb978f10af", 225},
{ "tbllist", GAME_TBLFILE, "95c44bfc380770a6b6dd0dfcc69e80a0", 309},
{ "xtbllist", GAME_XTBLFILE, "6c7b3db345d46349a5226f695c03e20f", 88},
@@ -837,7 +837,7 @@ static const AGOSGameDescription gameDescriptions[] = {
"Non-Interactive Demo",
{
- { "demo", GAME_BASEFILE, "50704abde6c68a226001400461620129", 7238},
+ { "demo", GAME_BASEFILE, "50704abde6c68a226001400461620129", 7238},
{ "icon.dat", GAME_ICONFILE, "ef1b8ad3494cf103dc10a99fe152ef9a", 20901},
{ "menus.dat", GAME_MENUFILE, "c4103f122d27677c9db144cae1394a66", 2},
AD_LISTEND
@@ -860,11 +860,11 @@ static const AGOSGameDescription gameDescriptions[] = {
"Floppy",
{
- { "gamepc", GAME_BASEFILE, "7751e9358e894e32ef40ef3b3bae0f2a", 51327},
+ { "gamepc", GAME_BASEFILE, "7751e9358e894e32ef40ef3b3bae0f2a", 51327},
{ "icon.dat", GAME_ICONFILE, "ef1b8ad3494cf103dc10a99fe152ef9a", 20901},
{ "menus.dat", GAME_MENUFILE, "3409eeb8ca8b46fc04da99de67573f5e", 320},
{ "roomslst", GAME_RMSLFILE, "e3758c46ab8f3c23a1ac012bd607108d", 128},
- { "start", GAME_RESTFILE, "036b647973d6884cdfc2042a3d12df83", 15354},
+ { "start", GAME_RESTFILE, "036b647973d6884cdfc2042a3d12df83", 15354},
{ "statelst", GAME_STATFILE, "469e98c69f00928a8366ba415d91902d", 11104},
{ "stripped.txt", GAME_STRFILE, "f259e3e07a1cde8d0404a767d815e12c", 225},
{ "tbllist", GAME_TBLFILE, "95c44bfc380770a6b6dd0dfcc69e80a0", 309},
@@ -889,11 +889,11 @@ static const AGOSGameDescription gameDescriptions[] = {
"Floppy",
{
- { "gamepc", GAME_BASEFILE, "7edfdcccbf7627532882192c1a356150", 53681},
+ { "gamepc", GAME_BASEFILE, "7edfdcccbf7627532882192c1a356150", 53681},
{ "icon.dat", GAME_ICONFILE, "ef1b8ad3494cf103dc10a99fe152ef9a", 20901},
{ "menus.dat", GAME_MENUFILE, "3409eeb8ca8b46fc04da99de67573f5e", 320},
{ "roomslst", GAME_RMSLFILE, "e3758c46ab8f3c23a1ac012bd607108d", 128},
- { "start", GAME_RESTFILE, "036b647973d6884cdfc2042a3d12df83", 15354},
+ { "start", GAME_RESTFILE, "036b647973d6884cdfc2042a3d12df83", 15354},
{ "statelst", GAME_STATFILE, "469e98c69f00928a8366ba415d91902d", 11104},
{ "stripped.txt", GAME_STRFILE, "f259e3e07a1cde8d0404a767d815e12c", 225},
{ "tbllist", GAME_TBLFILE, "95c44bfc380770a6b6dd0dfcc69e80a0", 309},
@@ -918,11 +918,11 @@ static const AGOSGameDescription gameDescriptions[] = {
"Floppy",
{
- { "gamepc", GAME_BASEFILE, "32ee34134422e286525c73e71bd0ea2d", 53523},
+ { "gamepc", GAME_BASEFILE, "32ee34134422e286525c73e71bd0ea2d", 53523},
{ "icon.dat", GAME_ICONFILE, "ef1b8ad3494cf103dc10a99fe152ef9a", 20901},
{ "menus.dat", GAME_MENUFILE, "3409eeb8ca8b46fc04da99de67573f5e", 320},
{ "roomslst", GAME_RMSLFILE, "e3758c46ab8f3c23a1ac012bd607108d", 128},
- { "start", GAME_RESTFILE, "036b647973d6884cdfc2042a3d12df83", 15354},
+ { "start", GAME_RESTFILE, "036b647973d6884cdfc2042a3d12df83", 15354},
{ "statelst", GAME_STATFILE, "469e98c69f00928a8366ba415d91902d", 11104},
{ "stripped.txt", GAME_STRFILE, "f259e3e07a1cde8d0404a767d815e12c", 225},
{ "tbllist", GAME_TBLFILE, "95c44bfc380770a6b6dd0dfcc69e80a0", 309},
@@ -947,11 +947,11 @@ static const AGOSGameDescription gameDescriptions[] = {
"Floppy",
{
- { "gamepc", GAME_BASEFILE, "b0d513069920a5e2eac2ea5d290692f1", 53307},
+ { "gamepc", GAME_BASEFILE, "b0d513069920a5e2eac2ea5d290692f1", 53307},
{ "icon.dat", GAME_ICONFILE, "ef1b8ad3494cf103dc10a99fe152ef9a", 20901},
{ "menus.dat", GAME_MENUFILE, "3409eeb8ca8b46fc04da99de67573f5e", 320},
{ "roomslst", GAME_RMSLFILE, "e3758c46ab8f3c23a1ac012bd607108d", 128},
- { "start", GAME_RESTFILE, "036b647973d6884cdfc2042a3d12df83", 15354},
+ { "start", GAME_RESTFILE, "036b647973d6884cdfc2042a3d12df83", 15354},
{ "statelst", GAME_STATFILE, "469e98c69f00928a8366ba415d91902d", -1},
{ "stripped.txt", GAME_STRFILE, "f259e3e07a1cde8d0404a767d815e12c", 225},
{ "tbllist", GAME_TBLFILE, "95c44bfc380770a6b6dd0dfcc69e80a0", 309},
@@ -1000,7 +1000,7 @@ static const AGOSGameDescription gameDescriptions[] = {
"CD Demo",
{
- { "data", GAME_GMEFILE, "b4a7526ced425ba8ad0d548d0ec69900", 1237886},
+ { "data", GAME_GMEFILE, "b4a7526ced425ba8ad0d548d0ec69900", 1237886},
{ "gamebase", GAME_BASEFILE, "425c7d1957699d35abca7e12a08c7422", 30879},
{ "icondata", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", 14361},
{ "stripped", GAME_STRFILE, "d9de7542612d9f4e0819ad0df5eac56b", 252},
@@ -1025,7 +1025,7 @@ static const AGOSGameDescription gameDescriptions[] = {
"CD",
{
- { "data", GAME_GMEFILE, "64958b3a38afdcb85da1eeed85169806", 6943110},
+ { "data", GAME_GMEFILE, "64958b3a38afdcb85da1eeed85169806", 6943110},
{ "gamebase", GAME_BASEFILE, "28261b99cd9da1242189b4f6f2841bd6", 29176},
{ "icondata", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", 14361},
{ "stripped", GAME_STRFILE, "f3b27a3fbb45dcd323a48159496e45e8", 252},
@@ -1292,7 +1292,7 @@ static const AGOSGameDescription gameDescriptions[] = {
"Floppy Demo",
{
- { "gdemo", GAME_BASEFILE, "2be4a21bc76e2fdc071867c130651439", 25288},
+ { "gdemo", GAME_BASEFILE, "2be4a21bc76e2fdc071867c130651439", 25288},
{ "icon.dat", GAME_ICONFILE, "55af3b4d93972bc58bfee38a86b76c3f", 11495},
{ "stripped.txt", GAME_STRFILE, "33a2e329b97b2a349858d6a093159eb7", 27},
{ "tbllist", GAME_TBLFILE, "1247e024e1f13ca54c1e354120c7519c", 105},
@@ -1316,7 +1316,7 @@ static const AGOSGameDescription gameDescriptions[] = {
"Floppy",
{
- { "gamepc", GAME_BASEFILE, "c392e494dcabed797b98cbcfc687b33a", -1},
+ { "gamepc", GAME_BASEFILE, "c392e494dcabed797b98cbcfc687b33a", -1},
{ "icon.dat", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", -1},
{ "stripped.txt", GAME_STRFILE, "c95a0a1ee973e19c2a1c5d12026c139f", -1},
{ "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8", -1},
@@ -1340,7 +1340,7 @@ static const AGOSGameDescription gameDescriptions[] = {
"Floppy",
{
- { "gamepc", GAME_BASEFILE, "62de24fc579b94fac7d3d23201b65b14", -1},
+ { "gamepc", GAME_BASEFILE, "62de24fc579b94fac7d3d23201b65b14", -1},
{ "icon.dat", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", -1},
{ "stripped.txt", GAME_STRFILE, "c95a0a1ee973e19c2a1c5d12026c139f", -1},
{ "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8", -1},
@@ -1364,7 +1364,7 @@ static const AGOSGameDescription gameDescriptions[] = {
"Floppy",
{
- { "gamepc", GAME_BASEFILE, "605fb866e03ec1c41b10c6a518ddfa49", -1},
+ { "gamepc", GAME_BASEFILE, "605fb866e03ec1c41b10c6a518ddfa49", -1},
{ "icon.dat", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", -1},
{ "stripped.txt", GAME_STRFILE, "c95a0a1ee973e19c2a1c5d12026c139f", -1},
{ "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8", -1},
@@ -1388,7 +1388,7 @@ static const AGOSGameDescription gameDescriptions[] = {
"Infocom Floppy",
{
- { "gamepc", GAME_BASEFILE, "9f93d27432ce44a787eef10adb640870", 37070},
+ { "gamepc", GAME_BASEFILE, "9f93d27432ce44a787eef10adb640870", 37070},
{ "icon.dat", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", 14361},
{ "stripped.txt", GAME_STRFILE, "2af9affc5981eec44b90d4c556145cb8", 252},
{ "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8", 711},
@@ -1412,7 +1412,7 @@ static const AGOSGameDescription gameDescriptions[] = {
"Infocom Floppy",
{
- { "gamepc", GAME_BASEFILE, "62de24fc579b94fac7d3d23201b65b14", -1},
+ { "gamepc", GAME_BASEFILE, "62de24fc579b94fac7d3d23201b65b14", -1},
{ "icon.dat", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", -1},
{ "stripped.txt", GAME_STRFILE, "2af9affc5981eec44b90d4c556145cb8", -1},
{ "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8", -1},
@@ -1436,7 +1436,7 @@ static const AGOSGameDescription gameDescriptions[] = {
"Floppy",
{
- { "gamepc", GAME_BASEFILE, "605fb866e03ec1c41b10c6a518ddfa49", -1},
+ { "gamepc", GAME_BASEFILE, "605fb866e03ec1c41b10c6a518ddfa49", -1},
{ "icon.dat", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", -1},
{ "stripped.txt", GAME_STRFILE, "2af9affc5981eec44b90d4c556145cb8", -1},
{ "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8", -1},
@@ -1460,7 +1460,7 @@ static const AGOSGameDescription gameDescriptions[] = {
"Floppy",
{
- { "gamepc", GAME_BASEFILE, "34759d0d4285a2f4b21b8e03b8fcefb3", -1},
+ { "gamepc", GAME_BASEFILE, "34759d0d4285a2f4b21b8e03b8fcefb3", -1},
{ "icon.dat", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", -1},
{ "stripped.txt", GAME_STRFILE, "aa01e7386057abc0c3e27dbaa9c4ba5b", -1},
{ "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8", -1},
@@ -1484,7 +1484,7 @@ static const AGOSGameDescription gameDescriptions[] = {
"Floppy",
{
- { "gamepc", GAME_BASEFILE, "063015e6ce7d90b570dbc21fe0c667b1", -1},
+ { "gamepc", GAME_BASEFILE, "063015e6ce7d90b570dbc21fe0c667b1", -1},
{ "icon.dat", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", -1},
{ "stripped.txt", GAME_STRFILE, "c95a0a1ee973e19c2a1c5d12026c139f", -1},
{ "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8", -1},
@@ -1508,7 +1508,7 @@ static const AGOSGameDescription gameDescriptions[] = {
"Floppy",
{
- { "gamepc", GAME_BASEFILE, "65c9b2dea57df84ef55d1eaf384ebd30", -1},
+ { "gamepc", GAME_BASEFILE, "65c9b2dea57df84ef55d1eaf384ebd30", -1},
{ "icon.dat", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", -1},
{ "stripped.txt", GAME_STRFILE, "2af9affc5981eec44b90d4c556145cb8", -1},
{ "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8", -1},
@@ -1532,7 +1532,7 @@ static const AGOSGameDescription gameDescriptions[] = {
"Floppy",
{
- { "gamepc", GAME_BASEFILE, "5374fafdea2068134f33deab225feed3", -1},
+ { "gamepc", GAME_BASEFILE, "5374fafdea2068134f33deab225feed3", -1},
{ "icon.dat", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", -1},
{ "stripped.txt", GAME_STRFILE, "2af9affc5981eec44b90d4c556145cb8", -1},
{ "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8", -1},
@@ -1557,7 +1557,7 @@ static const AGOSGameDescription gameDescriptions[] = {
{
{ "simon.gme", GAME_GMEFILE, "b4a7526ced425ba8ad0d548d0ec69900", 1237886},
- { "gamepc" , GAME_BASEFILE, "425c7d1957699d35abca7e12a08c7422", 30879},
+ { "gamepc" , GAME_BASEFILE, "425c7d1957699d35abca7e12a08c7422", 30879},
{ "icon.dat", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", 14361},
{ "stripped.txt", GAME_STRFILE, "d9de7542612d9f4e0819ad0df5eac56b", 252},
{ "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8", 711},
@@ -1581,7 +1581,7 @@ static const AGOSGameDescription gameDescriptions[] = {
"CD",
{
- { "gamepc", GAME_BASEFILE, "28261b99cd9da1242189b4f6f2841bd6", 29176},
+ { "gamepc", GAME_BASEFILE, "28261b99cd9da1242189b4f6f2841bd6", 29176},
{ "icon.dat", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", 14361},
{ "simon.gme", GAME_GMEFILE, "64958b3a38afdcb85da1eeed85169806", 6943110},
{ "stripped.txt", GAME_STRFILE, "f3b27a3fbb45dcd323a48159496e45e8", 252},
@@ -1606,7 +1606,7 @@ static const AGOSGameDescription gameDescriptions[] = {
"Infocom CD",
{
- { "gamepc", GAME_BASEFILE, "c0b948b6821d2140f8b977144f21027a", -1},
+ { "gamepc", GAME_BASEFILE, "c0b948b6821d2140f8b977144f21027a", -1},
{ "icon.dat", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", -1},
{ "simon.gme", GAME_GMEFILE, "64f73e94639b63af846ac4a8a94a23d8", -1},
{ "stripped.txt", GAME_STRFILE, "f3b27a3fbb45dcd323a48159496e45e8", -1},
@@ -1631,7 +1631,7 @@ static const AGOSGameDescription gameDescriptions[] = {
"CD",
{
- { "gamepc", GAME_BASEFILE, "3fac46064f69e5298f4f027f204c5aab", -1},
+ { "gamepc", GAME_BASEFILE, "3fac46064f69e5298f4f027f204c5aab", -1},
{ "icon.dat", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", -1},
{ "simon.gme", GAME_GMEFILE, "91321f0d806f8d9fef71a00e58581427", -1},
{ "stripped.txt", GAME_STRFILE, "ef51ac74c946881ae4d7ca66cc7a0d1e", -1},
@@ -1656,7 +1656,7 @@ static const AGOSGameDescription gameDescriptions[] = {
"CD",
{
- { "gamepc", GAME_BASEFILE, "3cfb9d1ff4ec725af9924140126cf69f", 39310},
+ { "gamepc", GAME_BASEFILE, "3cfb9d1ff4ec725af9924140126cf69f", 39310},
{ "icon.dat", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", 14361},
{ "simon.gme", GAME_GMEFILE, "638049fa5d41b81fb6fb11671721b871", 7041803},
{ "stripped.txt", GAME_STRFILE, "ef51ac74c946881ae4d7ca66cc7a0d1e", 252},
@@ -1681,7 +1681,7 @@ static const AGOSGameDescription gameDescriptions[] = {
"CD",
{
- { "gamepc", GAME_BASEFILE, "48b1f3499e2e0d731047f4d481ff7817", -1},
+ { "gamepc", GAME_BASEFILE, "48b1f3499e2e0d731047f4d481ff7817", -1},
{ "icon.dat", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", -1},
{ "simon.gme", GAME_GMEFILE, "7db9912acac4f1d965a64bdcfc370ba1", -1},
{ "stripped.txt", GAME_STRFILE, "40d68bec54042ef930f084ad9a4342a1", -1},
@@ -1706,7 +1706,7 @@ static const AGOSGameDescription gameDescriptions[] = {
"CD",
{
- { "gamepc", GAME_BASEFILE, "bc66e9c0b296e1b155a246917133f71a", 34348},
+ { "gamepc", GAME_BASEFILE, "bc66e9c0b296e1b155a246917133f71a", 34348},
{ "icon.dat", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", 14361},
{ "simon.gme", GAME_GMEFILE, "a34b2c8642f2e3676d7088b5c8b3e884", 6976948},
{ "stripped.txt", GAME_STRFILE, "9d31bef42db1a8abe4e9f368014df1d5", 252},
@@ -1731,7 +1731,7 @@ static const AGOSGameDescription gameDescriptions[] = {
"CD",
{
- { "gamepc", GAME_BASEFILE, "8d3ca654e158c91b860c7eae31d65312", 37807},
+ { "gamepc", GAME_BASEFILE, "8d3ca654e158c91b860c7eae31d65312", 37807},
{ "icon.dat", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", 14361},
{ "simon.gme", GAME_GMEFILE, "52e315e0e02feca86d15cc82e3306b6c", 7035767},
{ "stripped.txt", GAME_STRFILE, "9d31bef42db1a8abe4e9f368014df1d5", 252},
@@ -1756,7 +1756,7 @@ static const AGOSGameDescription gameDescriptions[] = {
"CD",
{
- { "gamepc", GAME_BASEFILE, "8d3ca654e158c91b860c7eae31d65312", -1},
+ { "gamepc", GAME_BASEFILE, "8d3ca654e158c91b860c7eae31d65312", -1},
{ "icon.dat", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", -1},
{ "simon.gme", GAME_GMEFILE, "104efd83c8f3edf545982e07d87f66ac", -1},
{ "stripped.txt", GAME_STRFILE, "9d31bef42db1a8abe4e9f368014df1d5", -1},
@@ -1782,7 +1782,7 @@ static const AGOSGameDescription gameDescriptions[] = {
"CD",
{
- { "gamepc", GAME_BASEFILE, "439f801ba52c02c9d1844600d1ce0f5e", 37847},
+ { "gamepc", GAME_BASEFILE, "439f801ba52c02c9d1844600d1ce0f5e", 37847},
{ "icon.dat", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", 14361},
{ "simon.gme", GAME_GMEFILE, "eff2774a73890b9eac533db90cd1afa1", 7030485},
{ "stripped.txt", GAME_STRFILE, "9d31bef42db1a8abe4e9f368014df1d5", 252},
@@ -1807,7 +1807,7 @@ static const AGOSGameDescription gameDescriptions[] = {
"CD",
{
- { "gamepc", GAME_BASEFILE, "c7c12fea7f6d0bfd22af5cdbc8166862", 36152},
+ { "gamepc", GAME_BASEFILE, "c7c12fea7f6d0bfd22af5cdbc8166862", 36152},
{ "icon.dat", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", 14361},
{ "simon.gme", GAME_GMEFILE, "b1b18d0731b64c0738c5cc4a2ee792fc", 7030377},
{ "stripped.txt", GAME_STRFILE, "a27e87a9ba21212d769804b3df47bfb2", 252},
@@ -1832,7 +1832,7 @@ static const AGOSGameDescription gameDescriptions[] = {
"CD",
{
- { "gamepc", GAME_BASEFILE, "48b1f3499e2e0d731047f4d481ff7817", -1},
+ { "gamepc", GAME_BASEFILE, "48b1f3499e2e0d731047f4d481ff7817", -1},
{ "icon.dat", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19", -1},
{ "simon.gme", GAME_GMEFILE, "acd9cc438525b142d93b15c77a6f551b", -1},
{ "stripped.txt", GAME_STRFILE, "40d68bec54042ef930f084ad9a4342a1", -1},
@@ -1857,7 +1857,7 @@ static const AGOSGameDescription gameDescriptions[] = {
"Floppy",
{
- { "game32", GAME_BASEFILE, "604d04315935e77624bd356ac926e068", -1},
+ { "game32", GAME_BASEFILE, "604d04315935e77624bd356ac926e068", -1},
{ "icon.dat", GAME_ICONFILE, "72096a62d36e6034ea9fecc13b2dbdab", -1},
{ "simon2.gme", GAME_GMEFILE, "aa6840420899a31874204f90bb214108", -1},
{ "stripped.txt", GAME_STRFILE, "e229f84d46fa83f99b4a7115679f3fb6", -1},
@@ -1882,7 +1882,7 @@ static const AGOSGameDescription gameDescriptions[] = {
"Floppy",
{
- { "game32", GAME_BASEFILE, "7edfc633dd50f8caa719c478443db70b", -1},
+ { "game32", GAME_BASEFILE, "7edfc633dd50f8caa719c478443db70b", -1},
{ "icon.dat", GAME_ICONFILE, "72096a62d36e6034ea9fecc13b2dbdab", -1},
{ "simon2.gme", GAME_GMEFILE, "aa6840420899a31874204f90bb214108", -1},
{ "stripped.txt", GAME_STRFILE, "e229f84d46fa83f99b4a7115679f3fb6", -1},
@@ -1907,7 +1907,7 @@ static const AGOSGameDescription gameDescriptions[] = {
"Floppy",
{
- { "game32", GAME_BASEFILE, "eb6e3e37fe52993f948d7e2d6b869828", -1},
+ { "game32", GAME_BASEFILE, "eb6e3e37fe52993f948d7e2d6b869828", -1},
{ "icon.dat", GAME_ICONFILE, "72096a62d36e6034ea9fecc13b2dbdab", -1},
{ "simon2.gme", GAME_GMEFILE, "5fa9d080b04c610f526bd685be1bf747", -1},
{ "stripped.txt", GAME_STRFILE, "fd30df01cc248ecbaef302af855e0212", -1},
@@ -1932,7 +1932,7 @@ static const AGOSGameDescription gameDescriptions[] = {
"Floppy",
{
- { "game32", GAME_BASEFILE, "604d04315935e77624bd356ac926e068", 59111},
+ { "game32", GAME_BASEFILE, "604d04315935e77624bd356ac926e068", 59111},
{ "icon.dat", GAME_ICONFILE, "72096a62d36e6034ea9fecc13b2dbdab", 18089},
{ "simon2.gme", GAME_GMEFILE, "ec9f0f24fd895e7ea72e3c8e448c0240", 19698755},
{ "stripped.txt", GAME_STRFILE, "6de6292c9ac11bfb2e70fdb0f773ba85", 171},
@@ -1957,7 +1957,7 @@ static const AGOSGameDescription gameDescriptions[] = {
"Floppy",
{
- { "game32", GAME_BASEFILE, "3e11d400bea0638f360a724687005cd1", -1},
+ { "game32", GAME_BASEFILE, "3e11d400bea0638f360a724687005cd1", -1},
{ "icon.dat", GAME_ICONFILE, "72096a62d36e6034ea9fecc13b2dbdab", -1},
{ "simon2.gme", GAME_GMEFILE, "f306a397565d7f13bec7ecf14c723de7", -1},
{ "stripped.txt", GAME_STRFILE, "bea6843fb9f3b2144fcb146d62db0b9a", -1},
@@ -2601,9 +2601,9 @@ static const AGOSGameDescription gameDescriptions[] = {
"CD",
{
- { "game22", GAME_BASEFILE, "629762ea9ca9ee9ff85f4774d219f5c7", 259576},
+ { "game22", GAME_BASEFILE, "629762ea9ca9ee9ff85f4774d219f5c7", 259576},
{ "gfxindex.dat", GAME_GFXIDXFILE,"f550f7915c5ce3a68c9f870f507449c2", 48000},
- { "setup", GAME_RESTFILE, "71512fc98501a8071a26b683a31dde78", 3360},
+ { "setup", GAME_RESTFILE, "71512fc98501a8071a26b683a31dde78", 3360},
{ "tbllist", GAME_TBLFILE, "0bbfee8e69739111eb36b0d138da8ddf", 668},
AD_LISTEND
},
@@ -2625,9 +2625,9 @@ static const AGOSGameDescription gameDescriptions[] = {
"CD",
{
- { "game22", GAME_BASEFILE, "bcd76ac080003eee3649df18db25b60e", 262517},
+ { "game22", GAME_BASEFILE, "bcd76ac080003eee3649df18db25b60e", 262517},
{ "gfxindex.dat", GAME_GFXIDXFILE,"f550f7915c5ce3a68c9f870f507449c2", 48000},
- { "setup", GAME_RESTFILE, "71512fc98501a8071a26b683a31dde78", 3360},
+ { "setup", GAME_RESTFILE, "71512fc98501a8071a26b683a31dde78", 3360},
{ "tbllist", GAME_TBLFILE, "0bbfee8e69739111eb36b0d138da8ddf", 668},
AD_LISTEND
},
@@ -2649,9 +2649,9 @@ static const AGOSGameDescription gameDescriptions[] = {
"CD",
{
- { "game22", GAME_BASEFILE, "629762ea9ca9ee9ff85f4774d219f5c7", 259576},
+ { "game22", GAME_BASEFILE, "629762ea9ca9ee9ff85f4774d219f5c7", 259576},
{ "graphics.vga", GAME_GFXIDXFILE,"11a4853cb35956846976e9473ee0e41e", 67456693},
- { "setup", GAME_RESTFILE, "71512fc98501a8071a26b683a31dde78", 3360},
+ { "setup", GAME_RESTFILE, "71512fc98501a8071a26b683a31dde78", 3360},
{ "tbllist", GAME_TBLFILE, "0bbfee8e69739111eb36b0d138da8ddf", 668},
AD_LISTEND
},
@@ -2673,9 +2673,9 @@ static const AGOSGameDescription gameDescriptions[] = {
"CD",
{
- { "game22", GAME_BASEFILE, "ba90b40a47726039671d9e91630dd7ed", 259668},
+ { "game22", GAME_BASEFILE, "ba90b40a47726039671d9e91630dd7ed", 259668},
{ "graphics.vga", GAME_GFXIDXFILE,"11a4853cb35956846976e9473ee0e41e", 67456693},
- { "setup", GAME_RESTFILE, "71512fc98501a8071a26b683a31dde78", 3360},
+ { "setup", GAME_RESTFILE, "71512fc98501a8071a26b683a31dde78", 3360},
{ "tbllist", GAME_TBLFILE, "0bbfee8e69739111eb36b0d138da8ddf", 668},
AD_LISTEND
},
@@ -2697,9 +2697,9 @@ static const AGOSGameDescription gameDescriptions[] = {
"CD",
{
- { "game22", GAME_BASEFILE, "bcd76ac080003eee3649df18db25b60e", 262517},
+ { "game22", GAME_BASEFILE, "bcd76ac080003eee3649df18db25b60e", 262517},
{ "graphics.vga", GAME_GFXIDXFILE,"11a4853cb35956846976e9473ee0e41e", 67456693},
- { "setup", GAME_RESTFILE, "71512fc98501a8071a26b683a31dde78", 3360},
+ { "setup", GAME_RESTFILE, "71512fc98501a8071a26b683a31dde78", 3360},
{ "tbllist", GAME_TBLFILE, "0bbfee8e69739111eb36b0d138da8ddf", 668},
AD_LISTEND
},
@@ -2721,9 +2721,9 @@ static const AGOSGameDescription gameDescriptions[] = {
"CD",
{
- { "game22", GAME_BASEFILE, "71d7d2d5e479b053c5a9757f1702c9c3", 265629},
+ { "game22", GAME_BASEFILE, "71d7d2d5e479b053c5a9757f1702c9c3", 265629},
{ "graphics.vga", GAME_GFXIDXFILE,"11a4853cb35956846976e9473ee0e41e", 67456693},
- { "setup", GAME_RESTFILE, "71512fc98501a8071a26b683a31dde78", 3360},
+ { "setup", GAME_RESTFILE, "71512fc98501a8071a26b683a31dde78", 3360},
{ "tbllist", GAME_TBLFILE, "0bbfee8e69739111eb36b0d138da8ddf", 668},
AD_LISTEND
},
@@ -2767,8 +2767,8 @@ static const AGOSGameDescription gameDescriptions[] = {
{
{ "game22", GAME_BASEFILE, "629762ea9ca9ee9ff85f4774d219f5c7", 259576},
- { "save.999", GAME_RESTFILE, "71512fc98501a8071a26b683a31dde78", 3360},
- { "tbllist", GAME_TBLFILE, "0bbfee8e69739111eb36b0d138da8ddf", 668},
+ { "save.999", GAME_RESTFILE, "71512fc98501a8071a26b683a31dde78", 3360},
+ { "tbllist", GAME_TBLFILE, "0bbfee8e69739111eb36b0d138da8ddf", 668},
AD_LISTEND
},
Common::EN_ANY,
@@ -2790,8 +2790,8 @@ static const AGOSGameDescription gameDescriptions[] = {
{
{ "game33", GAME_BASEFILE, "cda37c422c04dde8b8ab3405178b3ef9", 266565},
- { "save.999", GAME_RESTFILE, "71512fc98501a8071a26b683a31dde78", 3360},
- { "tbllist", GAME_TBLFILE, "0bbfee8e69739111eb36b0d138da8ddf", 668},
+ { "save.999", GAME_RESTFILE, "71512fc98501a8071a26b683a31dde78", 3360},
+ { "tbllist", GAME_TBLFILE, "0bbfee8e69739111eb36b0d138da8ddf", 668},
AD_LISTEND
},
Common::PL_POL,
@@ -2834,8 +2834,8 @@ static const AGOSGameDescription gameDescriptions[] = {
{
{ "game22", GAME_BASEFILE, "a8746407a5b20a7da0da0a14c380af1c", 251647},
- { "save.999", GAME_RESTFILE, "71512fc98501a8071a26b683a31dde78", 3360},
- { "tbllist", GAME_TBLFILE, "0bbfee8e69739111eb36b0d138da8ddf", 668},
+ { "save.999", GAME_RESTFILE, "71512fc98501a8071a26b683a31dde78", 3360},
+ { "tbllist", GAME_TBLFILE, "0bbfee8e69739111eb36b0d138da8ddf", 668},
AD_LISTEND
},
Common::EN_ANY,
@@ -2857,8 +2857,8 @@ static const AGOSGameDescription gameDescriptions[] = {
{
{ "game22", GAME_BASEFILE, "ba90b40a47726039671d9e91630dd7ed", -1},
- { "save.999", GAME_RESTFILE, "71512fc98501a8071a26b683a31dde78", -1},
- { "tbllist", GAME_TBLFILE, "0bbfee8e69739111eb36b0d138da8ddf", -1},
+ { "save.999", GAME_RESTFILE, "71512fc98501a8071a26b683a31dde78", -1},
+ { "tbllist", GAME_TBLFILE, "0bbfee8e69739111eb36b0d138da8ddf", -1},
AD_LISTEND
},
Common::FR_FRA,
@@ -2880,8 +2880,8 @@ static const AGOSGameDescription gameDescriptions[] = {
{
{ "game22", GAME_BASEFILE, "bcd76ac080003eee3649df18db25b60e", -1},
- { "save.999", GAME_RESTFILE, "71512fc98501a8071a26b683a31dde78", -1},
- { "tbllist", GAME_TBLFILE, "0bbfee8e69739111eb36b0d138da8ddf", -1},
+ { "save.999", GAME_RESTFILE, "71512fc98501a8071a26b683a31dde78", -1},
+ { "tbllist", GAME_TBLFILE, "0bbfee8e69739111eb36b0d138da8ddf", -1},
AD_LISTEND
},
Common::DE_DEU,
@@ -2903,8 +2903,8 @@ static const AGOSGameDescription gameDescriptions[] = {
{
{ "game22", GAME_BASEFILE, "80576f2e1ed4c912b63921fe77af313e", -1},
- { "save.999", GAME_RESTFILE, "71512fc98501a8071a26b683a31dde78", -1},
- { "tbllist", GAME_TBLFILE, "0bbfee8e69739111eb36b0d138da8ddf", -1},
+ { "save.999", GAME_RESTFILE, "71512fc98501a8071a26b683a31dde78", -1},
+ { "tbllist", GAME_TBLFILE, "0bbfee8e69739111eb36b0d138da8ddf", -1},
AD_LISTEND
},
Common::IT_ITA,
@@ -2926,8 +2926,8 @@ static const AGOSGameDescription gameDescriptions[] = {
{
{ "game22", GAME_BASEFILE, "c498f892a5dbcbc968e0dbb8697884fc", 258660},
- { "save.999", GAME_RESTFILE, "71512fc98501a8071a26b683a31dde78", 3360},
- { "tbllist", GAME_TBLFILE, "0bbfee8e69739111eb36b0d138da8ddf", 668},
+ { "save.999", GAME_RESTFILE, "71512fc98501a8071a26b683a31dde78", 3360},
+ { "tbllist", GAME_TBLFILE, "0bbfee8e69739111eb36b0d138da8ddf", 668},
AD_LISTEND
},
Common::PL_POL,
@@ -2949,8 +2949,8 @@ static const AGOSGameDescription gameDescriptions[] = {
{
{ "game22", GAME_BASEFILE, "71d7d2d5e479b053c5a9757f1702c9c3", -1},
- { "save.999", GAME_RESTFILE, "71512fc98501a8071a26b683a31dde78", -1},
- { "tbllist", GAME_TBLFILE, "0bbfee8e69739111eb36b0d138da8ddf", -1},
+ { "save.999", GAME_RESTFILE, "71512fc98501a8071a26b683a31dde78", -1},
+ { "tbllist", GAME_TBLFILE, "0bbfee8e69739111eb36b0d138da8ddf", -1},
AD_LISTEND
},
Common::ES_ESP,
@@ -3034,7 +3034,7 @@ static const AGOSGameDescription gameDescriptions[] = {
"CD",
{
- { "Gjumble", GAME_BASEFILE, "d54cce46d339038d1a6b74ea213655bc", 5953},
+ { "Gjumble", GAME_BASEFILE, "d54cce46d339038d1a6b74ea213655bc", 5953},
AD_LISTEND
},
Common::EN_ANY,
@@ -3076,7 +3076,7 @@ static const AGOSGameDescription gameDescriptions[] = {
"CD",
{
- { "Gpuzzle", GAME_BASEFILE, "3f80dac8e0d85401a1058a560fe49ab6", 23218},
+ { "Gpuzzle", GAME_BASEFILE, "3f80dac8e0d85401a1058a560fe49ab6", 23218},
AD_LISTEND
},
Common::EN_ANY,
@@ -3118,7 +3118,7 @@ static const AGOSGameDescription gameDescriptions[] = {
"CD",
{
- { "Gswampy", GAME_BASEFILE, "3a6d4d7b2433e660f2483f9396cc87a2", 30360},
+ { "Gswampy", GAME_BASEFILE, "3a6d4d7b2433e660f2483f9396cc87a2", 30360},
AD_LISTEND
},
Common::EN_ANY,
@@ -3139,7 +3139,7 @@ static const AGOSGameDescription gameDescriptions[] = {
"CD",
{
- { "Gswampy", GAME_BASEFILE, "4b44f26f51c9c4a16210b4ff9875d24c", -1},
+ { "Gswampy", GAME_BASEFILE, "4b44f26f51c9c4a16210b4ff9875d24c", -1},
AD_LISTEND
},
Common::DE_DEU,
@@ -3160,7 +3160,7 @@ static const AGOSGameDescription gameDescriptions[] = {
"CD",
{
- { "Gswampy", GAME_BASEFILE, "31bfb5169b47ccc19177e61bd31d4391", -1},
+ { "Gswampy", GAME_BASEFILE, "31bfb5169b47ccc19177e61bd31d4391", -1},
AD_LISTEND
},
Common::PL_POL,
@@ -3181,7 +3181,7 @@ static const AGOSGameDescription gameDescriptions[] = {
"CD",
{
- { "Gswampy", GAME_BASEFILE, "a534faabea5881d1f350544362edab87", -1},
+ { "Gswampy", GAME_BASEFILE, "a534faabea5881d1f350544362edab87", -1},
AD_LISTEND
},
Common::ES_ESP,
Commit: bb3a9d75bda3c1b3655b31d611ca184d8260ac77
https://github.com/scummvm/scummvm/commit/bb3a9d75bda3c1b3655b31d611ca184d8260ac77
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-28T13:28:57+01:00
Commit Message:
AVALANCHE: Use AD_ENTRY2s
Changed paths:
engines/avalanche/detection.cpp
diff --git a/engines/avalanche/detection.cpp b/engines/avalanche/detection.cpp
index e3ae30a70f..30f954d875 100644
--- a/engines/avalanche/detection.cpp
+++ b/engines/avalanche/detection.cpp
@@ -42,11 +42,8 @@ static const PlainGameDescriptor avalancheGames[] = {
static const ADGameDescription gameDescriptions[] = {
{
"avalanche", 0,
- {
- {"avalot.sez", 0, "de10eb353228013da3d3297784f81ff9", 48763},
- {"mainmenu.avd", 0, "89f31211af579a872045b175cc264298", 18880},
- AD_LISTEND
- },
+ AD_ENTRY2s("avalot.sez", "de10eb353228013da3d3297784f81ff9", 48763,
+ "mainmenu.avd", "89f31211af579a872045b175cc264298", 18880),
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_UNSTABLE,
Commit: 53cd3e42de2f55313210ee1fa1f7637505f0d8be
https://github.com/scummvm/scummvm/commit/53cd3e42de2f55313210ee1fa1f7637505f0d8be
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-28T13:34:39+01:00
Commit Message:
CGE: Use AD_ENTRY2s in detection
Changed paths:
engines/cge/detection.cpp
diff --git a/engines/cge/detection.cpp b/engines/cge/detection.cpp
index 6bc346bd5e..a043fee390 100644
--- a/engines/cge/detection.cpp
+++ b/engines/cge/detection.cpp
@@ -40,76 +40,52 @@ static const PlainGameDescriptor CGEGames[] = {
static const ADGameDescription gameDescriptions[] = {
{
"soltys", "Freeware",
- {
- {"vol.cat", 0, "0c33e2c304821a2444d297fc5e2d67c6", 50176},
- {"vol.dat", 0, "f9ae2e7f8f7cac91378cdafca43faf1e", 8437676},
- AD_LISTEND
- },
+ AD_ENTRY2s("vol.cat", "0c33e2c304821a2444d297fc5e2d67c6", 50176,
+ "vol.dat", "f9ae2e7f8f7cac91378cdafca43faf1e", 8437676),
Common::PL_POL, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GAMEOPTION_COLOR_BLIND_DEFAULT_OFF)
},
{
"soltys", "Demo (not supported)",
- {
- {"vol.cat", 0, "1e077c8ff58109a187f07ac54b0c873a", 18788},
- {"vol.dat", 0, "75d385a6074c58b69f7730481f256051", 1796710},
- AD_LISTEND
- },
+ AD_ENTRY2s("vol.cat", "1e077c8ff58109a187f07ac54b0c873a", 18788,
+ "vol.dat", "75d385a6074c58b69f7730481f256051", 1796710),
Common::EN_ANY, Common::kPlatformDOS, ADGF_DEMO , GUIO1(GAMEOPTION_COLOR_BLIND_DEFAULT_OFF)
},
{
"soltys", "Demo (not supported)",
- {
- {"vol.cat", 0, "f17987487fab1ebddd781d8d02fedecc", 7168},
- {"vol.dat", 0, "c5d9b15863cab61dc125551576dece04", 1075272},
- AD_LISTEND
- },
+ AD_ENTRY2s("vol.cat", "f17987487fab1ebddd781d8d02fedecc", 7168,
+ "vol.dat", "c5d9b15863cab61dc125551576dece04", 1075272),
Common::PL_POL, Common::kPlatformDOS, ADGF_DEMO , GUIO1(GAMEOPTION_COLOR_BLIND_DEFAULT_OFF)
},
{
"soltys", "Freeware v1.0",
- {
- {"vol.cat", 0, "f1675684c68ab90272f5776f8f2c3974", 50176},
- {"vol.dat", 0, "4ffeff4abc99ac5999b55ccfc56ab1df", 8430868},
- AD_LISTEND
- },
+ AD_ENTRY2s("vol.cat", "f1675684c68ab90272f5776f8f2c3974", 50176,
+ "vol.dat", "4ffeff4abc99ac5999b55ccfc56ab1df", 8430868),
Common::EN_ANY, Common::kPlatformDOS, ADGF_NO_FLAGS , GUIO1(GAMEOPTION_COLOR_BLIND_DEFAULT_OFF)
},
{
"soltys", "Freeware v1.0",
- {
- {"vol.cat", 0, "20fdce799adb618100ef9ee2362be875", 50176},
- {"vol.dat", 0, "0e43331c846094d77f5dd201827e0a3b", 8439339},
- AD_LISTEND
- },
+ AD_ENTRY2s("vol.cat", "20fdce799adb618100ef9ee2362be875", 50176,
+ "vol.dat", "0e43331c846094d77f5dd201827e0a3b", 8439339),
Common::PL_POL, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GAMEOPTION_COLOR_BLIND_DEFAULT_OFF)
},
{
"soltys", "Freeware v1.0",
- {
- {"vol.cat", 0, "fcae86b20eaa5cedec17b24fa5e85eb4", 50176},
- {"vol.dat", 0, "ff10d54acc2c95696c57e05819b6906f", 8450151},
- AD_LISTEND
- },
+ AD_ENTRY2s("vol.cat", "fcae86b20eaa5cedec17b24fa5e85eb4", 50176,
+ "vol.dat", "ff10d54acc2c95696c57e05819b6906f", 8450151),
Common::ES_ESP, Common::kPlatformDOS, ADGF_NO_FLAGS , GUIO1(GAMEOPTION_COLOR_BLIND_DEFAULT_OFF)
},
{
"soltys", "Russian fan-translation v1.0",
- {
- {"vol.cat", 0, "e9f6069c9c4d4156a8dbe004a9c1960d", 50176},
- {"vol.dat", 0, "f9ae2e7f8f7cac91378cdafca43faf1e", 8749623},
- AD_LISTEND
- },
+ AD_ENTRY2s("vol.cat", "e9f6069c9c4d4156a8dbe004a9c1960d", 50176,
+ "vol.dat", "f9ae2e7f8f7cac91378cdafca43faf1e", 8749623),
Common::RU_RUS, Common::kPlatformDOS, ADGF_NO_FLAGS , GUIO1(GAMEOPTION_COLOR_BLIND_DEFAULT_OFF)
},
{
"soltys", "Russian fan-translation v1.1",
- {
- {"vol.cat", 0, "72a93fa5b81f29aaf362f1dc8a5956e0", 50176},
- {"vol.dat", 0, "b93e053cabf8dfdcece3de59a8e2f9e1", 8739481},
- AD_LISTEND
- },
+ AD_ENTRY2s("vol.cat", "72a93fa5b81f29aaf362f1dc8a5956e0", 50176,
+ "vol.dat", "b93e053cabf8dfdcece3de59a8e2f9e1", 8739481),
Common::RU_RUS, Common::kPlatformDOS, ADGF_NO_FLAGS , GUIO1(GAMEOPTION_COLOR_BLIND_DEFAULT_OFF)
},
Commit: a1557341b3989f9370d8a82118fc891abc3f2fb1
https://github.com/scummvm/scummvm/commit/a1557341b3989f9370d8a82118fc891abc3f2fb1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-28T13:41:50+01:00
Commit Message:
CGE: Use ADGF_UNSUPPORTED for demos
Changed paths:
engines/cge/detection.cpp
diff --git a/engines/cge/detection.cpp b/engines/cge/detection.cpp
index a043fee390..af1d1d9676 100644
--- a/engines/cge/detection.cpp
+++ b/engines/cge/detection.cpp
@@ -45,16 +45,16 @@ static const ADGameDescription gameDescriptions[] = {
Common::PL_POL, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GAMEOPTION_COLOR_BLIND_DEFAULT_OFF)
},
{
- "soltys", "Demo (not supported)",
+ "soltys", _s("Missing game code"),
AD_ENTRY2s("vol.cat", "1e077c8ff58109a187f07ac54b0c873a", 18788,
"vol.dat", "75d385a6074c58b69f7730481f256051", 1796710),
Common::EN_ANY, Common::kPlatformDOS, ADGF_DEMO , GUIO1(GAMEOPTION_COLOR_BLIND_DEFAULT_OFF)
},
{
- "soltys", "Demo (not supported)",
+ "soltys", _s("Missing game code"),
AD_ENTRY2s("vol.cat", "f17987487fab1ebddd781d8d02fedecc", 7168,
"vol.dat", "c5d9b15863cab61dc125551576dece04", 1075272),
- Common::PL_POL, Common::kPlatformDOS, ADGF_DEMO , GUIO1(GAMEOPTION_COLOR_BLIND_DEFAULT_OFF)
+ Common::PL_POL, Common::kPlatformDOS, ADGF_DEMO | ADGF_UNSUPPORTED , GUIO1(GAMEOPTION_COLOR_BLIND_DEFAULT_OFF)
},
{
"soltys", "Freeware v1.0",
Commit: 09249f7ef27991b5c1a5c0026a8b07072869c7ab
https://github.com/scummvm/scummvm/commit/09249f7ef27991b5c1a5c0026a8b07072869c7ab
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-28T13:45:22+01:00
Commit Message:
CGE2: Use AD_ENTRY2s in detection table
Changed paths:
engines/cge2/detection.cpp
diff --git a/engines/cge2/detection.cpp b/engines/cge2/detection.cpp
index 89ac7b1db4..5e6d03ef43 100644
--- a/engines/cge2/detection.cpp
+++ b/engines/cge2/detection.cpp
@@ -41,61 +41,43 @@ static const PlainGameDescriptor CGE2Games[] = {
static const ADGameDescription gameDescriptions[] = {
{
"sfinx", "Freeware",
- {
- { "vol.cat", 0, "21197b287d397c53261b6616bf0dd880", 129024 },
- { "vol.dat", 0, "de14291869a8eb7c2732ab783c7542ef", 34180844 },
- AD_LISTEND
- },
+ AD_ENTRY2s("vol.cat", "21197b287d397c53261b6616bf0dd880", 129024,
+ "vol.dat", "de14291869a8eb7c2732ab783c7542ef", 34180844),
Common::PL_POL, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GAMEOPTION_COLOR_BLIND_DEFAULT_OFF)
},
{
"sfinx", "Freeware v1.0",
- {
- {"vol.cat", 0, "aa402aed24a72c53a4d1211c456b79dd", 129024},
- {"vol.dat", 0, "5966ac26d91d664714349669f9dd09b5", 34180164},
- AD_LISTEND
- },
+ AD_ENTRY2s("vol.cat", "aa402aed24a72c53a4d1211c456b79dd", 129024,
+ "vol.dat", "5966ac26d91d664714349669f9dd09b5", 34180164),
Common::PL_POL, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GAMEOPTION_COLOR_BLIND_DEFAULT_OFF)
},
{
"sfinx", "Freeware v1.1",
- {
- {"vol.cat", 0, "aa402aed24a72c53a4d1211c456b79dd", 129024},
- {"vol.dat", 0, "5966ac26d91d664714349669f9dd09b5", 34180367},
- AD_LISTEND
- },
+ AD_ENTRY2s("vol.cat", "aa402aed24a72c53a4d1211c456b79dd", 129024,
+ "vol.dat", "5966ac26d91d664714349669f9dd09b5", 34180367),
Common::PL_POL, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GAMEOPTION_COLOR_BLIND_DEFAULT_OFF)
},
{
"sfinx", "Freeware v0.3",
- {
- {"vol.cat", 0, "f158e469dccbebc5a632eb848df89779", 129024},
- {"vol.dat", 0, "d40a6b4ae173d6930be54ba56bee15d5", 34183430},
- AD_LISTEND
- },
+ AD_ENTRY2s("vol.cat", "f158e469dccbebc5a632eb848df89779", 129024,
+ "vol.dat", "d40a6b4ae173d6930be54ba56bee15d5", 34183430),
Common::EN_ANY, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GAMEOPTION_COLOR_BLIND_DEFAULT_OFF)
},
{
"sfinx", "Freeware v1.0",
- {
- {"vol.cat", 0, "f158e469dccbebc5a632eb848df89779", 129024},
- {"vol.dat", 0, "d40a6b4ae173d6930be54ba56bee15d5", 34183443},
- AD_LISTEND
- },
+ AD_ENTRY2s("vol.cat", "f158e469dccbebc5a632eb848df89779", 129024,
+ "vol.dat", "d40a6b4ae173d6930be54ba56bee15d5", 34183443),
Common::EN_ANY, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GAMEOPTION_COLOR_BLIND_DEFAULT_OFF)
},
{
"sfinx", "Freeware v1.1",
- {
- {"vol.cat", 0, "f158e469dccbebc5a632eb848df89779", 129024},
- {"vol.dat", 0, "d40a6b4ae173d6930be54ba56bee15d5", 34182773},
- AD_LISTEND
- },
+ AD_ENTRY2s("vol.cat", "f158e469dccbebc5a632eb848df89779", 129024,
+ "vol.dat", "d40a6b4ae173d6930be54ba56bee15d5", 34182773),
Common::EN_ANY, Common::kPlatformDOS, ADGF_NO_FLAGS, GUIO1(GAMEOPTION_COLOR_BLIND_DEFAULT_OFF)
},
Commit: e4f1351d0535f8ba36cae13388bb6bc564e60285
https://github.com/scummvm/scummvm/commit/e4f1351d0535f8ba36cae13388bb6bc564e60285
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-28T13:49:16+01:00
Commit Message:
CINE: Use AD_ENTRY2s in the detection tables
Changed paths:
engines/cine/detection_tables.h
diff --git a/engines/cine/detection_tables.h b/engines/cine/detection_tables.h
index 8db9ecc9a3..58b4c23434 100644
--- a/engines/cine/detection_tables.h
+++ b/engines/cine/detection_tables.h
@@ -46,11 +46,8 @@ static const CINEGameDescription gameDescriptions[] = {
{
"fw",
"Sony CD version",
- {
- { "AUTO00.PRC", 0, "4fe1e7930b38e3c63f0f2474d471bf8f", -1},
- { "PART01", 0, "61d003202d301c29dd399acfb1354310", -1},
- AD_LISTEND
- },
+ AD_ENTRY2s("AUTO00.PRC", "4fe1e7930b38e3c63f0f2474d471bf8f", -1,
+ "PART01", "61d003202d301c29dd399acfb1354310", -1),
Common::EN_USA,
Common::kPlatformDOS,
ADGF_CD,
@@ -205,11 +202,8 @@ static const CINEGameDescription gameDescriptions[] = {
{
"fw",
"Demo",
- {
- { "demo", 0, "0f50767cd964e302d3af0ba2528df8c4", -1},
- { "demo.prc", 0, "d2ac3a743d288359c63644ea7071edae", -1},
- AD_LISTEND
- },
+ AD_ENTRY2s("demo", "0f50767cd964e302d3af0ba2528df8c4", -1,
+ "demo.prc", "d2ac3a743d288359c63644ea7071edae", -1),
Common::EN_ANY,
Common::kPlatformAmiga,
ADGF_DEMO,
@@ -346,11 +340,8 @@ static const CINEGameDescription gameDescriptions[] = {
{
"os",
"256 colors",
- {
- { "procs1", 0, "74c2dabd9d212525fca8875a5f6d8994", -1},
- { "sds1", 0, "75443ba39cdc95667e07d7118e5c151c", -1},
- AD_LISTEND
- },
+ AD_ENTRY2s("procs1", "74c2dabd9d212525fca8875a5f6d8994", -1,
+ "sds1", "75443ba39cdc95667e07d7118e5c151c", -1),
Common::ES_ESP,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
Commit: 0e2cc2f66186b53618cf071871d7102010c1a570
https://github.com/scummvm/scummvm/commit/0e2cc2f66186b53618cf071871d7102010c1a570
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-28T14:03:06+01:00
Commit Message:
DIRECTOR: Use AD_ENTRY2s in the detection table
Changed paths:
engines/director/detection_tables.h
diff --git a/engines/director/detection_tables.h b/engines/director/detection_tables.h
index 26eb76eb0d..b991103070 100644
--- a/engines/director/detection_tables.h
+++ b/engines/director/detection_tables.h
@@ -162,11 +162,8 @@ static const DirectorGameDescription gameDescriptions[] = {
{
{
"lzone", "",
- {
- {"L_ZONE.EXE", 0, "65d06b5fef155a2473434571aff5bc29", 370009},
- {"SYNER_01.MMM", 0, "56b6f1c68e85a96bcdd01028bdec2d35", 460594},
- AD_LISTEND
- },
+ AD_ENTRY2s("L_ZONE.EXE", "65d06b5fef155a2473434571aff5bc29", 370009,
+ "SYNER_01.MMM", "56b6f1c68e85a96bcdd01028bdec2d35", 460594),
Common::EN_ANY,
Common::kPlatformWindows,
ADGF_NO_FLAGS,
@@ -225,11 +222,8 @@ static const DirectorGameDescription gameDescriptions[] = {
{
{
"wrath", "",
- {
- {"000WRATH.EXE", 0, "3162423a1d0885eb1eb94f557a86b258", 372970},
- {"SHARDCST.MMM", 0, "22af72fba773cc5313d99c91b2e5aea9", 3432948},
- AD_LISTEND
- },
+ AD_ENTRY2s("000WRATH.EXE", "3162423a1d0885eb1eb94f557a86b258", 372970,
+ "SHARDCST.MMM", "22af72fba773cc5313d99c91b2e5aea9", 3432948),
Common::EN_ANY,
Common::kPlatformWindows,
ADGF_NO_FLAGS,
@@ -242,11 +236,8 @@ static const DirectorGameDescription gameDescriptions[] = {
{
{
"wrath", "Demo",
- {
- {"000WRATH.EXE", 0, "3162423a1d0885eb1eb94f557a86b258", 372970},
- {"SHARDCST.MMM", 0, "85d166abe18730d96e9d4137c66255a1", 3553330},
- AD_LISTEND
- },
+ AD_ENTRY2s("000WRATH.EXE", "3162423a1d0885eb1eb94f557a86b258", 372970,
+ "SHARDCST.MMM", "85d166abe18730d96e9d4137c66255a1", 3553330),
Common::EN_ANY,
Common::kPlatformWindows,
ADGF_DEMO,
@@ -263,11 +254,8 @@ static const DirectorGameDescription gameDescriptions[] = {
{
{
"ybr1", "",
- {
- {"YBR.EXE", 0, "2cc9e2dacb90fb130f6ee9519b66c5a8", 369007},
- {"START.MMM", 0, "69012b34b3f0e6f1886133b807db4476", 2566872},
- AD_LISTEND
- },
+ AD_ENTRY2s("YBR.EXE", "2cc9e2dacb90fb130f6ee9519b66c5a8", 369007,
+ "START.MMM", "69012b34b3f0e6f1886133b807db4476", 2566872),
Common::EN_ANY,
Common::kPlatformWindows,
ADGF_NO_FLAGS,
@@ -280,11 +268,8 @@ static const DirectorGameDescription gameDescriptions[] = {
{
{
"ybr1", "",
- {
- {"YBR", 0, "f5277c53bacd27936158dd3867e587e2", 414498},
- {"START", 0, "ca4a6650d8f8ce04b26bcbc941bf0a86", 2417242},
- AD_LISTEND
- },
+ AD_ENTRY2s("YBR", "f5277c53bacd27936158dd3867e587e2", 414498,
+ "START", "ca4a6650d8f8ce04b26bcbc941bf0a86", 2417242),
Common::JA_JPN,
Common::kPlatformMacintosh,
ADGF_MACRESFORK,
@@ -297,11 +282,8 @@ static const DirectorGameDescription gameDescriptions[] = {
{
{
"ybr1", "",
- {
- {"YBR.EXE", 0, "2cc9e2dacb90fb130f6ee9519b66c5a8", 369007},
- {"START.MMM", 0, "9e02f41270708101b1d5d04cb822a784", 2563274},
- AD_LISTEND
- },
+ AD_ENTRY2s("YBR.EXE", "2cc9e2dacb90fb130f6ee9519b66c5a8", 369007,
+ "START.MMM", "9e02f41270708101b1d5d04cb822a784", 2563274),
Common::JA_JPN,
Common::kPlatformWindows,
ADGF_NO_FLAGS,
@@ -388,11 +370,8 @@ static const DirectorGameDescription gameDescriptions[] = {
{
{
"hamsterland1", "Danish alt",
- {
- {"Hamsterland", 0, "bcd3c718db258701496b3c5bcb827ef2", 483774},
- {"AIRDK", 0, "f74f18a9d454db63465dac151a6b5706", 8425728},
- AD_LISTEND
- },
+ AD_ENTRY2s("Hamsterland", "bcd3c718db258701496b3c5bcb827ef2", 483774,
+ "AIRDK", "f74f18a9d454db63465dac151a6b5706", 8425728),
Common::EN_ANY,
Common::kPlatformMacintosh,
ADGF_MACRESFORK,
@@ -405,11 +384,8 @@ static const DirectorGameDescription gameDescriptions[] = {
{
{
"hamsterland1", "Swedish alt",
- {
- {"Hamsterland", 0, "bcd3c718db258701496b3c5bcb827ef2", 483774},
- {"AIRSW", 0, "ccf7c642796c5aeb9fee4c663bdd02d9", 7588992},
- AD_LISTEND
- },
+ AD_ENTRY2s("Hamsterland", "bcd3c718db258701496b3c5bcb827ef2", 483774,
+ "AIRSW", "ccf7c642796c5aeb9fee4c663bdd02d9", 7588992),
Common::EN_ANY,
Common::kPlatformMacintosh,
ADGF_MACRESFORK,
@@ -422,11 +398,8 @@ static const DirectorGameDescription gameDescriptions[] = {
{
{
"hamsterland1", "Danish alt",
- {
- {"HAMSTER.EXE", 0, "2bb6e93d9aab502f46dbf163d51eb785", 785327},
- {"AIRDK", 0, "ad98bbbd724e31a8a125e284a74d0241", 8425546},
- AD_LISTEND
- },
+ AD_ENTRY2s("HAMSTER.EXE", "2bb6e93d9aab502f46dbf163d51eb785", 785327,
+ "AIRDK", "ad98bbbd724e31a8a125e284a74d0241", 8425546),
Common::EN_ANY,
Common::kPlatformWindows,
ADGF_NO_FLAGS,
@@ -439,11 +412,8 @@ static const DirectorGameDescription gameDescriptions[] = {
{
{
"hamsterland1", "Spanish alt",
- {
- {"HAMSTER.EXE", 0, "a0d2cfdf10ec14c00338329277bc8acc", 727653},
- {"AIRSP", 0, "9b5b82d488b96b2fcf5e78ec8769e29a", 8432260},
- AD_LISTEND
- },
+ AD_ENTRY2s("HAMSTER.EXE", "a0d2cfdf10ec14c00338329277bc8acc", 727653,
+ "AIRSP", "9b5b82d488b96b2fcf5e78ec8769e29a", 8432260),
Common::EN_ANY,
Common::kPlatformWindows,
ADGF_NO_FLAGS,
@@ -456,11 +426,8 @@ static const DirectorGameDescription gameDescriptions[] = {
{
{
"hamsterland1", "Swedish alt",
- {
- {"HAMSTER.EXE", 0, "2bb6e93d9aab502f46dbf163d51eb785", 785327},
- {"AIRSW", 0, "410efb55564b8eb2042eea61d0f8025b", 7588828},
- AD_LISTEND
- },
+ AD_ENTRY2s("HAMSTER.EXE", "2bb6e93d9aab502f46dbf163d51eb785", 785327,
+ "AIRSW", "410efb55564b8eb2042eea61d0f8025b", 7588828),
Common::EN_ANY,
Common::kPlatformWindows,
ADGF_NO_FLAGS,
@@ -501,11 +468,8 @@ static const DirectorGameDescription gameDescriptions[] = {
{
{
"improv", "Dolan Game",
- {
- {"IMPROV (PowerPC)", 0, "096e0aacbc1670c80a354c3c49b3fabe", 60324},
- {"INTRO.DIR", 0, "dd667e45e402729581c70f278140f3a5", 3400832},
- AD_LISTEND
- },
+ AD_ENTRY2s("IMPROV (PowerPC)", "096e0aacbc1670c80a354c3c49b3fabe", 60324,
+ "INTRO.DIR", "dd667e45e402729581c70f278140f3a5", 3400832),
Common::EN_ANY,
Common::kPlatformMacintosh,
ADGF_MACRESFORK,
@@ -518,11 +482,8 @@ static const DirectorGameDescription gameDescriptions[] = {
{
{
"improv", "Shirley Game",
- {
- {"IMPROV (PowerPC)", 0, "096e0aacbc1670c80a354c3c49b3fabe", 60324},
- {"INTRO.DIR", 0, "62695e977e1a29647e630f70349a3690", 2926976},
- AD_LISTEND
- },
+ AD_ENTRY2s("IMPROV (PowerPC)", "096e0aacbc1670c80a354c3c49b3fabe", 60324,
+ "INTRO.DIR", "62695e977e1a29647e630f70349a3690", 2926976),
Common::EN_ANY,
Common::kPlatformMacintosh,
ADGF_MACRESFORK,
@@ -535,11 +496,8 @@ static const DirectorGameDescription gameDescriptions[] = {
{
{
"improv", "Dolan Game",
- {
- {"IMPROV.EXE", 0, "097276acd3caee9bc79b85af79278643", 730079},
- {"INTRO.DIR", 0, "075c3c7bd7c059280ca86c6b906bf97b", 46366},
- AD_LISTEND
- },
+ AD_ENTRY2s("IMPROV.EXE", "097276acd3caee9bc79b85af79278643", 730079,
+ "INTRO.DIR", "075c3c7bd7c059280ca86c6b906bf97b", 46366),
Common::EN_ANY,
Common::kPlatformWindows,
ADGF_NO_FLAGS,
@@ -552,11 +510,8 @@ static const DirectorGameDescription gameDescriptions[] = {
{
{
"improv", "Shirley Game",
- {
- {"IMPROV.EXE", 0, "097276acd3caee9bc79b85af79278643", 730079},
- {"INTRO.DIR", 0, "37f2d3c0b6f805e7a0f3a3ea62f8297c", 44532},
- AD_LISTEND
- },
+ AD_ENTRY2s("IMPROV.EXE", "097276acd3caee9bc79b85af79278643", 730079,
+ "INTRO.DIR", "37f2d3c0b6f805e7a0f3a3ea62f8297c", 44532),
Common::EN_ANY,
Common::kPlatformWindows,
ADGF_NO_FLAGS,
@@ -665,11 +620,8 @@ static const DirectorGameDescription gameDescriptions[] = {
{
{
"operafatal", "",
- {
- {"OPERA FATAL", 0, "f5033f237ad1b1639fc46d01a82ac380", 285566},
- {"SPRINT.Dxr", 0, "3e86f01eeac5fa3349c5177378997a7f", 694912},
- AD_LISTEND
- },
+ AD_ENTRY2s("OPERA FATAL", "f5033f237ad1b1639fc46d01a82ac380", 285566,
+ "SPRINT.Dxr", "3e86f01eeac5fa3349c5177378997a7f", 694912),
Common::EN_ANY,
Common::kPlatformMacintosh,
ADGF_MACRESFORK,
@@ -682,11 +634,8 @@ static const DirectorGameDescription gameDescriptions[] = {
{
{
"operafatal", "",
- {
- {"OPERA FATAL", 0, "f5033f237ad1b1639fc46d01a82ac380", 285566},
- {"SPRINT.Dxr", 0, "3eb6f5568c9ced258059e2cfd30751c5", 479616},
- AD_LISTEND
- },
+ AD_ENTRY2s("OPERA FATAL", "f5033f237ad1b1639fc46d01a82ac380", 285566,
+ "SPRINT.Dxr", "3eb6f5568c9ced258059e2cfd30751c5", 479616),
Common::IT_ITA,
Common::kPlatformMacintosh,
ADGF_MACRESFORK,
@@ -800,11 +749,8 @@ static const DirectorGameDescription gameDescriptions[] = {
// Masters of the Elements - English (from lotharsm)
"melements", "",
- {
- {"check.dxr", 0, "36f42340e819d1532c850880afe16581", 898206},
- {"Masters of the Elements", 0, 0, 1034962},
- AD_LISTEND
- },
+ AD_ENTRY2s("check.dxr", "36f42340e819d1532c850880afe16581", 898206,
+ "Masters of the Elements", 0, 1034962),
Common::EN_ANY,
Common::kPlatformMacintosh,
ADGF_MACRESFORK,
@@ -822,11 +768,8 @@ static const DirectorGameDescription gameDescriptions[] = {
// The game disc is a hybrid CD-ROM containing both the Windows and the Macintosh release.
"melements", "",
- {
- {"CHECK.DXR", 0, "c31ee30eebd24a8cf31691fc9926daa4", 901820},
- {"MVM.EXE", 0, 0, 2565921},
- AD_LISTEND
- },
+ AD_ENTRY2s("CHECK.DXR", "c31ee30eebd24a8cf31691fc9926daa4", 901820,
+ "MVM.EXE", 0, 2565921),
Common::EN_ANY,
Common::kPlatformWindows,
ADGF_NO_FLAGS,
@@ -841,11 +784,8 @@ static const DirectorGameDescription gameDescriptions[] = {
// Masters of the Elements - German (from lotharsm)
"melements", "",
- {
- {"check.dxr", 0, "9c81934b7616ab077f44825b8afaa83e", 575426},
- {"Meister Zufall", 0, 0, 1034962},
- AD_LISTEND
- },
+ AD_ENTRY2s("check.dxr", "9c81934b7616ab077f44825b8afaa83e", 575426,
+ "Meister Zufall", 0, 1034962),
Common::DE_DEU,
Common::kPlatformMacintosh,
ADGF_MACRESFORK,
@@ -864,11 +804,8 @@ static const DirectorGameDescription gameDescriptions[] = {
// The game disc is a hybrid CD-ROM containing both the Windows and the Macintosh release.
"melements", "",
- {
- {"CHECK.DXR", 0, "d1cd0ed95b0e30597e0089bf3e5caf0f", 575414},
- {"MVM.EXE", 0, 0, 1512503},
- AD_LISTEND
- },
+ AD_ENTRY2s("CHECK.DXR", "d1cd0ed95b0e30597e0089bf3e5caf0f", 575414,
+ "MVM.EXE", 0, 1512503),
Common::DE_DEU,
Common::kPlatformWindows,
ADGF_NO_FLAGS,
Commit: 4644b000119752b442bd675387e3af44ce4ad3cc
https://github.com/scummvm/scummvm/commit/4644b000119752b442bd675387e3af44ce4ad3cc
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-28T14:05:27+01:00
Commit Message:
DM: Use AD_ENTRY2s in detection table
Changed paths:
engines/dm/detection.cpp
diff --git a/engines/dm/detection.cpp b/engines/dm/detection.cpp
index c426cb39c2..32ab68e991 100644
--- a/engines/dm/detection.cpp
+++ b/engines/dm/detection.cpp
@@ -41,11 +41,8 @@ static const PlainGameDescriptor DMGames[] = {
static const DMADGameDescription gameDescriptions[] = {
{
{"dm", "Amiga v2.0 English",
- {
- {"graphics.dat", 0, "c2205f6225bde728417de29394f97d55", 411960},
- {"Dungeon.dat", 0, "43a213da8eda413541dd12f90ce202f6", 25006},
- AD_LISTEND
- },
+ AD_ENTRY2s("graphics.dat", "c2205f6225bde728417de29394f97d55", 411960,
+ "Dungeon.dat", "43a213da8eda413541dd12f90ce202f6", 25006),
Common::EN_ANY, Common::kPlatformAmiga, ADGF_NO_FLAGS, GUIO1(GUIO_NOMIDI)
},
kDMSaveTargetDM21, kDMSaveFormatAmigaPC98FmTowns, kDMSavePlatformAmiga,
@@ -55,11 +52,8 @@ static const DMADGameDescription gameDescriptions[] = {
},
{
{"dm", "Atari v??? English",
- {
- {"graphics.dat", 0, "6ffff2a17e2df0effa9a12fb4b1bf6b6", 271911},
- {"Dungeon.dat", 0, "be9468b460515741babec9a70501e2e9", 33286},
- AD_LISTEND
- },
+ AD_ENTRY2s("graphics.dat", "6ffff2a17e2df0effa9a12fb4b1bf6b6", 271911,
+ "Dungeon.dat", "be9468b460515741babec9a70501e2e9", 33286),
Common::EN_ANY, Common::kPlatformAtariST, ADGF_NO_FLAGS, GUIO1(GUIO_NOMIDI),
},
kDMSaveTargetDM21, kDMSaveFormatAmigaPC98FmTowns, kDMSavePlatformAtariSt,
@@ -70,11 +64,8 @@ static const DMADGameDescription gameDescriptions[] = {
{
// Added by Strangerke
{"dm", "Amiga Demo v2.0 English",
- {
- {"graphics.dat", 0, "3932c8359bb36c24291b09e915114d38", 192421},
- {"DemoDun.dat", 0, "78848e1a2d3d5a11e5954deb8c7b772b", 1209},
- AD_LISTEND
- },
+ AD_ENTRY2s("graphics.dat", "3932c8359bb36c24291b09e915114d38", 192421,
+ "DemoDun.dat", "78848e1a2d3d5a11e5954deb8c7b772b", 1209),
Common::EN_ANY, Common::kPlatformAmiga, ADGF_DEMO, GUIO1(GUIO_NOMIDI),
},
kDMSaveTargetDM21, kDMSaveFormatAmigaPC98FmTowns, kDMSavePlatformAtariSt,
Commit: 10793ed9fa84276cbc6400c2301df9fd69bab34f
https://github.com/scummvm/scummvm/commit/10793ed9fa84276cbc6400c2301df9fd69bab34f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-28T14:06:41+01:00
Commit Message:
DRAGONS: Use AD_ENTRY2s in the detection table
Changed paths:
engines/dragons/detection.cpp
diff --git a/engines/dragons/detection.cpp b/engines/dragons/detection.cpp
index d0385df445..1b8cfa65f7 100644
--- a/engines/dragons/detection.cpp
+++ b/engines/dragons/detection.cpp
@@ -85,11 +85,8 @@ static const DragonsGameDescription gameDescriptions[] = {
{
"dragons",
0,
- {
- {"bigfile.dat", 0, "02c26712bee57266f28235fdc0207725", 44990464},
- {"dtspeech.xa", 0, "7f7ace860e5dd3696b51eace20215274", 182138880},
- AD_LISTEND
- },
+ AD_ENTRY2s("bigfile.dat", "02c26712bee57266f28235fdc0207725", 44990464,
+ "dtspeech.xa", "7f7ace860e5dd3696b51eace20215274", 182138880),
Common::RU_RUS,
Common::kPlatformPSX,
ADGF_DROPPLATFORM,
Commit: e804ba69a789e7266b5b645d310130b3f509db9e
https://github.com/scummvm/scummvm/commit/e804ba69a789e7266b5b645d310130b3f509db9e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-28T14:14:03+01:00
Commit Message:
DREAMWEB: Use AD_ENTRY2s in the detection tables
Changed paths:
engines/dreamweb/detection_tables.h
diff --git a/engines/dreamweb/detection_tables.h b/engines/dreamweb/detection_tables.h
index 73802e862e..7a854e0427 100644
--- a/engines/dreamweb/detection_tables.h
+++ b/engines/dreamweb/detection_tables.h
@@ -55,11 +55,8 @@ static const DreamWebGameDescription gameDescriptions[] = {
{
"dreamweb",
"CD",
- {
- {"dreamweb.r00", 0, "3b5c87717fc40cc5a5ae19c155662ee3", 152918},
- {"dreamweb.r02", 0, "d6fe5e3590ec1eea42ff65c10b023e0f", 198681},
- AD_LISTEND
- },
+ AD_ENTRY2s("dreamweb.r00", "3b5c87717fc40cc5a5ae19c155662ee3", 152918,
+ "dreamweb.r02", "d6fe5e3590ec1eea42ff65c10b023e0f", 198681),
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_CD,
@@ -93,11 +90,8 @@ static const DreamWebGameDescription gameDescriptions[] = {
{
"dreamweb",
"CD",
- {
- {"dreamweb.r00", 0, "8acafd7f4418d08d0e16b65b8b10bc50", 152983},
- {"dreamweb.r02", 0, "c0c363715ddf14ab54f2379906a3aa01", 198707},
- AD_LISTEND
- },
+ AD_ENTRY2s("dreamweb.r00", "8acafd7f4418d08d0e16b65b8b10bc50", 152983,
+ "dreamweb.r02", "c0c363715ddf14ab54f2379906a3aa01", 198707),
Common::EN_USA,
Common::kPlatformDOS,
ADGF_CD,
@@ -110,11 +104,8 @@ static const DreamWebGameDescription gameDescriptions[] = {
{
"dreamweb",
"CD",
- {
- {"dreamwfr.r00", 0, "e354582a8564faf5c515df92f207e8d1", 154657},
- {"dreamwfr.r02", 0, "57f3f08d5aefd04184eac76927eced80", 200575},
- AD_LISTEND
- },
+ AD_ENTRY2s("dreamwfr.r00", "e354582a8564faf5c515df92f207e8d1", 154657,
+ "dreamwfr.r02", "57f3f08d5aefd04184eac76927eced80", 200575),
Common::FR_FRA,
Common::kPlatformDOS,
ADGF_CD,
@@ -128,11 +119,8 @@ static const DreamWebGameDescription gameDescriptions[] = {
{
"dreamweb",
"CD",
- {
- {"dreamwfr.r00", 0, "e354582a8564faf5c515df92f207e8d1", 154657},
- {"dreamwfr.r02", 0, "cb99f08d5aefd04184eac76927eced80", 200575},
- AD_LISTEND
- },
+ AD_ENTRY2s("dreamwfr.r00", "e354582a8564faf5c515df92f207e8d1", 154657,
+ "dreamwfr.r02", "cb99f08d5aefd04184eac76927eced80", 200575),
Common::FR_FRA,
Common::kPlatformDOS,
ADGF_CD,
@@ -145,11 +133,8 @@ static const DreamWebGameDescription gameDescriptions[] = {
{
"dreamweb",
"",
- {
- {"dreamweb.r00", 0, "9960dc3baddabc6ad2a6fd75292b149c", 155886},
- {"dreamweb.r02", 0, "48e1f42a53402f963ca2d1ed969f4084", 212823},
- AD_LISTEND
- },
+ AD_ENTRY2s("dreamweb.r00", "9960dc3baddabc6ad2a6fd75292b149c", 155886,
+ "dreamweb.r02", "48e1f42a53402f963ca2d1ed969f4084", 212823),
Common::DE_DEU,
Common::kPlatformDOS,
0,
@@ -162,11 +147,8 @@ static const DreamWebGameDescription gameDescriptions[] = {
{
"dreamweb",
"CD",
- {
- {"dreamweb.r00", 0, "9960dc3baddabc6ad2a6fd75292b149c", 155886},
- {"dreamweb.r02", 0, "076ca7cd326cb2abfb2091c6cf46ae08", 201038},
- AD_LISTEND
- },
+ AD_ENTRY2s("dreamweb.r00", "9960dc3baddabc6ad2a6fd75292b149c", 155886,
+ "dreamweb.r02", "076ca7cd326cb2abfb2091c6cf46ae08", 201038),
Common::DE_DEU,
Common::kPlatformDOS,
ADGF_CD,
@@ -179,11 +161,8 @@ static const DreamWebGameDescription gameDescriptions[] = {
{
"dreamweb",
"",
- {
- {"dreamweb.r00", 0, "2df07174321de39c4f17c9ff654b268a", 153608},
- {"dreamweb.r02", 0, "f97d435ad5da08fb1bcf6ea3dd6e0b9e", 199499},
- AD_LISTEND
- },
+ AD_ENTRY2s("dreamweb.r00", "2df07174321de39c4f17c9ff654b268a", 153608,
+ "dreamweb.r02", "f97d435ad5da08fb1bcf6ea3dd6e0b9e", 199499),
Common::ES_ESP,
Common::kPlatformDOS,
0,
@@ -196,11 +175,8 @@ static const DreamWebGameDescription gameDescriptions[] = {
{
"dreamweb",
"CD",
- {
- {"dreamwsp.r00", 0, "2df07174321de39c4f17c9ff654b268a", 153608},
- {"dreamwsp.r02", 0, "577d435ad5da08fb1bcf6ea3dd6e0b9e", 199499},
- AD_LISTEND
- },
+ AD_ENTRY2s("dreamwsp.r00", "2df07174321de39c4f17c9ff654b268a", 153608,
+ "dreamwsp.r02", "577d435ad5da08fb1bcf6ea3dd6e0b9e", 199499),
Common::ES_ESP,
Common::kPlatformDOS,
ADGF_CD,
@@ -214,11 +190,8 @@ static const DreamWebGameDescription gameDescriptions[] = {
{
"dreamweb",
"CD",
- {
- {"dreamwsp.r00", 0, "2df07174321de39c4f17c9ff654b268a", 153608},
- {"dreamwsp.r02", 0, "f97d435ad5da08fb1bcf6ea3dd6e0b9e", 199499},
- AD_LISTEND
- },
+ AD_ENTRY2s("dreamwsp.r00", "2df07174321de39c4f17c9ff654b268a", 153608,
+ "dreamwsp.r02", "f97d435ad5da08fb1bcf6ea3dd6e0b9e", 199499),
Common::ES_ESP,
Common::kPlatformDOS,
ADGF_CD,
@@ -231,11 +204,8 @@ static const DreamWebGameDescription gameDescriptions[] = {
{
"dreamweb",
"",
- {
- {"dreamweb.r00", 0, "66dcab08354232f423c590156335f819", 155448},
- {"dreamweb.r02", 0, "87a026e9f80ed4f94169381f871ee305", 199676},
- AD_LISTEND
- },
+ AD_ENTRY2s("dreamweb.r00", "66dcab08354232f423c590156335f819", 155448,
+ "dreamweb.r02", "87a026e9f80ed4f94169381f871ee305", 199676),
Common::IT_ITA,
Common::kPlatformDOS,
0,
Commit: db6f4ce9aeedc8133fc951a2d476521ab80a0d5a
https://github.com/scummvm/scummvm/commit/db6f4ce9aeedc8133fc951a2d476521ab80a0d5a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-28T14:16:19+01:00
Commit Message:
GNAP: Use macros in detection tables
Changed paths:
engines/gnap/detection.cpp
diff --git a/engines/gnap/detection.cpp b/engines/gnap/detection.cpp
index ac5a85891d..ac8ca9ca6f 100644
--- a/engines/gnap/detection.cpp
+++ b/engines/gnap/detection.cpp
@@ -39,42 +39,27 @@ namespace Gnap {
static const ADGameDescription gameDescriptions[] = {
{
"gnap", "",
- {
- {"stock_n.dat", 0, "46819043d019a2f36b727cc2bdd6980f", 12515823},
- AD_LISTEND
- },
+ AD_ENTRY1s("stock_n.dat", "46819043d019a2f36b727cc2bdd6980f", 12515823),
Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, GUIO0()
},
{
"gnap", "",
- {
- {"stock_n.dat", 0, "46819043d019a2f36b727cc2bdd6980f", 13497301},
- AD_LISTEND
- },
+ AD_ENTRY1s("stock_n.dat", "46819043d019a2f36b727cc2bdd6980f", 13497301),
Common::EN_ANY, Common::kPlatformWindows, ADGF_NO_FLAGS, GUIO0()
},
{
"gnap", "",
- {
- {"stock_n.dat", 0, "46819043d019a2f36b727cc2bdd6980f", 12995485},
- AD_LISTEND
- },
+ AD_ENTRY1s("stock_n.dat", "46819043d019a2f36b727cc2bdd6980f", 12995485),
Common::RU_RUS, Common::kPlatformWindows, ADGF_NO_FLAGS, GUIO0()
},
{
"gnap", "Fargus",
- {
- {"stock_n.dat", 0, "46819043d019a2f36b727cc2bdd6980f", 12847726},
- AD_LISTEND
- },
+ AD_ENTRY1s("stock_n.dat", "46819043d019a2f36b727cc2bdd6980f", 12847726),
Common::RU_RUS, Common::kPlatformWindows, ADGF_NO_FLAGS, GUIO0()
},
{
"gnap", "",
- {
- {"stock_n.dat", 0, "9729e1c77a74f2f23c53596fae385bfa", 13428133},
- AD_LISTEND
- },
+ AD_ENTRY1s("stock_n.dat", "9729e1c77a74f2f23c53596fae385bfa", 13428133),
Common::PL_POL, Common::kPlatformWindows, ADGF_NO_FLAGS, GUIO0()
},
Commit: e875632acca0aa3b55206a6e21600a1f13247022
https://github.com/scummvm/scummvm/commit/e875632acca0aa3b55206a6e21600a1f13247022
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-28T14:39:33+01:00
Commit Message:
GOB: Use AD_ENTRY2s in the detection tables
Changed paths:
engines/gob/detection/tables_adibou.h
engines/gob/detection/tables_gob1.h
engines/gob/detection/tables_lit.h
engines/gob/detection/tables_littlered.h
engines/gob/detection/tables_playtoons.h
engines/gob/detection/tables_woodruff.h
diff --git a/engines/gob/detection/tables_adibou.h b/engines/gob/detection/tables_adibou.h
index a995e8d1b3..b19f89f8ee 100644
--- a/engines/gob/detection/tables_adibou.h
+++ b/engines/gob/detection/tables_adibou.h
@@ -193,11 +193,8 @@
{
"adibou2",
"Non-Interactive Demo",
- {
- {"demogb.scn", 0, "9291455a908ac0e6aaaca686e532609b", 105},
- {"demogb.vmd", 0, "bc9c1db97db7bec8f566332444fa0090", 14320840},
- {0, 0, 0, 0}
- },
+ AD_ENTRY2s("demogb.scn", "9291455a908ac0e6aaaca686e532609b", 105,
+ "demogb.vmd", "bc9c1db97db7bec8f566332444fa0090", 14320840),
EN_GRB,
kPlatformDOS,
ADGF_DEMO,
@@ -211,11 +208,8 @@
{
"adibou2",
"Non-Interactive Demo",
- {
- {"demoall.scn", 0, "c8fd308c037b829800006332b2c32674", 106},
- {"demoall.vmd", 0, "4672b2deacc6fca97484840424b1921b", 14263433},
- {0, 0, 0, 0}
- },
+ AD_ENTRY2s("demoall.scn", "c8fd308c037b829800006332b2c32674", 106,
+ "demoall.vmd", "4672b2deacc6fca97484840424b1921b", 14263433),
DE_DEU,
kPlatformDOS,
ADGF_DEMO,
@@ -229,11 +223,8 @@
{
"adibou2",
"Non-Interactive Demo",
- {
- {"demofra.scn", 0, "d1b2b1618af384ea1120def8b986c02b", 106},
- {"demofra.vmd", 0, "b494cdec1aac7e54c3f2480512d2880e", 14297100},
- {0, 0, 0, 0}
- },
+ AD_ENTRY2s("demofra.scn", "d1b2b1618af384ea1120def8b986c02b", 106,
+ "demofra.vmd", "b494cdec1aac7e54c3f2480512d2880e", 14297100),
FR_FRA,
kPlatformDOS,
ADGF_DEMO,
diff --git a/engines/gob/detection/tables_gob1.h b/engines/gob/detection/tables_gob1.h
index 9afd1bc9ac..42a27b86b7 100644
--- a/engines/gob/detection/tables_gob1.h
+++ b/engines/gob/detection/tables_gob1.h
@@ -407,11 +407,8 @@
{
"gob1",
"",
- {
- {"intro.stk", 0, "f5f028ee39c456fa51fa63b606583918", 313472},
- {"musmac1.mid", 0, "4f66903b33df8a20edd4c748809c0b56", 8161},
- {0, 0, 0, 0}
- },
+ AD_ENTRY2s("intro.stk", "f5f028ee39c456fa51fa63b606583918", 313472,
+ "musmac1.mid", "4f66903b33df8a20edd4c748809c0b56", 8161),
FR_FRA,
kPlatformWindows,
ADGF_NO_FLAGS,
@@ -425,11 +422,8 @@
{
"gob1",
"",
- {
- {"intro.stk", 0, "f5f028ee39c456fa51fa63b606583918", 313472},
- {"musmac1.mid", 0, "4f66903b33df8a20edd4c748809c0b56", 8161},
- {0, 0, 0, 0}
- },
+ AD_ENTRY2s("intro.stk", "f5f028ee39c456fa51fa63b606583918", 313472,
+ "musmac1.mid", "4f66903b33df8a20edd4c748809c0b56", 8161),
IT_ITA,
kPlatformWindows,
ADGF_NO_FLAGS,
@@ -443,11 +437,8 @@
{
"gob1",
"",
- {
- {"intro.stk", 0, "f5f028ee39c456fa51fa63b606583918", 313472},
- {"musmac1.mid", 0, "4f66903b33df8a20edd4c748809c0b56", 8161},
- {0, 0, 0, 0}
- },
+ AD_ENTRY2s("intro.stk", "f5f028ee39c456fa51fa63b606583918", 313472,
+ "musmac1.mid", "4f66903b33df8a20edd4c748809c0b56", 8161),
EN_GRB,
kPlatformWindows,
ADGF_NO_FLAGS,
@@ -461,11 +452,8 @@
{
"gob1",
"",
- {
- {"intro.stk", 0, "f5f028ee39c456fa51fa63b606583918", 313472},
- {"musmac1.mid", 0, "4f66903b33df8a20edd4c748809c0b56", 8161},
- {0, 0, 0, 0}
- },
+ AD_ENTRY2s("intro.stk", "f5f028ee39c456fa51fa63b606583918", 313472,
+ "musmac1.mid", "4f66903b33df8a20edd4c748809c0b56", 8161),
DE_DEU,
kPlatformWindows,
ADGF_NO_FLAGS,
@@ -479,11 +467,8 @@
{
"gob1",
"",
- {
- {"intro.stk", 0, "f5f028ee39c456fa51fa63b606583918", 313472},
- {"musmac1.mid", 0, "4f66903b33df8a20edd4c748809c0b56", 8161},
- {0, 0, 0, 0}
- },
+ AD_ENTRY2s("intro.stk", "f5f028ee39c456fa51fa63b606583918", 313472,
+ "musmac1.mid", "4f66903b33df8a20edd4c748809c0b56", 8161),
ES_ESP,
kPlatformWindows,
ADGF_NO_FLAGS,
@@ -497,11 +482,8 @@
{
"gob1",
"",
- {
- {"intro.stk", 0, "e157cb59c6d330ca70d12ab0ef1dd12b", 288972},
- {"musmac1.mid", 0, "4f66903b33df8a20edd4c748809c0b56", 8161},
- {0, 0, 0, 0}
- },
+ AD_ENTRY2s("intro.stk", "e157cb59c6d330ca70d12ab0ef1dd12b", 288972,
+ "musmac1.mid", "4f66903b33df8a20edd4c748809c0b56", 8161),
EN_GRB,
kPlatformWindows,
ADGF_NO_FLAGS,
@@ -515,11 +497,8 @@
{
"gob1",
"",
- {
- {"intro.stk", 0, "e157cb59c6d330ca70d12ab0ef1dd12b", 288972},
- {"musmac1.mid", 0, "4f66903b33df8a20edd4c748809c0b56", 8161},
- {0, 0, 0, 0}
- },
+ AD_ENTRY2s("intro.stk", "e157cb59c6d330ca70d12ab0ef1dd12b", 288972,
+ "musmac1.mid", "4f66903b33df8a20edd4c748809c0b56", 8161),
FR_FRA,
kPlatformWindows,
ADGF_NO_FLAGS,
@@ -533,11 +512,8 @@
{
"gob1",
"",
- {
- {"intro.stk", 0, "e157cb59c6d330ca70d12ab0ef1dd12b", 288972},
- {"musmac1.mid", 0, "4f66903b33df8a20edd4c748809c0b56", 8161},
- {0, 0, 0, 0}
- },
+ AD_ENTRY2s("intro.stk", "e157cb59c6d330ca70d12ab0ef1dd12b", 288972,
+ "musmac1.mid", "4f66903b33df8a20edd4c748809c0b56", 8161),
ES_ESP,
kPlatformWindows,
ADGF_NO_FLAGS,
@@ -551,11 +527,8 @@
{
"gob1",
"",
- {
- {"intro.stk", 0, "e157cb59c6d330ca70d12ab0ef1dd12b", 288972},
- {"musmac1.mid", 0, "4f66903b33df8a20edd4c748809c0b56", 8161},
- {0, 0, 0, 0}
- },
+ AD_ENTRY2s("intro.stk", "e157cb59c6d330ca70d12ab0ef1dd12b", 288972,
+ "musmac1.mid", "4f66903b33df8a20edd4c748809c0b56", 8161),
IT_ITA,
kPlatformWindows,
ADGF_NO_FLAGS,
@@ -569,11 +542,8 @@
{
"gob1",
"",
- {
- {"intro.stk", 0, "e157cb59c6d330ca70d12ab0ef1dd12b", 288972},
- {"musmac1.mid", 0, "4f66903b33df8a20edd4c748809c0b56", 8161},
- {0, 0, 0, 0}
- },
+ AD_ENTRY2s("intro.stk", "e157cb59c6d330ca70d12ab0ef1dd12b", 288972,
+ "musmac1.mid", "4f66903b33df8a20edd4c748809c0b56", 8161),
DE_DEU,
kPlatformWindows,
ADGF_NO_FLAGS,
diff --git a/engines/gob/detection/tables_lit.h b/engines/gob/detection/tables_lit.h
index f6df3162db..baf877bc56 100644
--- a/engines/gob/detection/tables_lit.h
+++ b/engines/gob/detection/tables_lit.h
@@ -344,11 +344,8 @@
{
"lit1",
"Light install",
- {
- {"intro.stk", 0, "93c91bc9e783d00033042ae83144d7dd", 72318},
- {"partie2.itk", 0, "78f00bd8eb9e680e6289bba0130b1b33", 664064},
- {0, 0, 0, 0}
- },
+ AD_ENTRY2s("intro.stk", "93c91bc9e783d00033042ae83144d7dd", 72318,
+ "partie2.itk", "78f00bd8eb9e680e6289bba0130b1b33", 664064),
FR_FRA,
kPlatformWindows,
ADGF_NO_FLAGS,
@@ -362,11 +359,8 @@
{
"lit1",
"Full install",
- {
- {"intro.stk", 0, "93c91bc9e783d00033042ae83144d7dd", 72318},
- {"partie2.itk", 0, "78f00bd8eb9e680e6289bba0130b1b33", 4396644},
- {0, 0, 0, 0}
- },
+ AD_ENTRY2s("intro.stk", "93c91bc9e783d00033042ae83144d7dd", 72318,
+ "partie2.itk", "78f00bd8eb9e680e6289bba0130b1b33", 4396644),
FR_FRA,
kPlatformWindows,
ADGF_NO_FLAGS,
@@ -397,11 +391,8 @@
{
"lit2",
"Full install",
- {
- {"intro.stk", 0, "17acbb212e62addbe48dc8f2282c98cb", 72318},
- {"partie4.itk", 0, "6ce4967e0c79d7daeabc6c1d26783d4c", 2612087},
- {0, 0, 0, 0}
- },
+ AD_ENTRY2s("intro.stk", "17acbb212e62addbe48dc8f2282c98cb", 72318,
+ "partie4.itk", "6ce4967e0c79d7daeabc6c1d26783d4c", 2612087),
FR_FRA,
kPlatformWindows,
ADGF_NO_FLAGS,
@@ -418,11 +409,8 @@
{
"lit",
"",
- {
- {"intro.stk", 0, "af98bcdc70e1f1c1635577fd726fe7f1", 3937310},
- {"musmac1.mid", 0, "ae7229bb09c6abe4e60a2768b24bc890", 9398},
- {0, 0, 0, 0}
- },
+ AD_ENTRY2s("intro.stk", "af98bcdc70e1f1c1635577fd726fe7f1", 3937310,
+ "musmac1.mid", "ae7229bb09c6abe4e60a2768b24bc890", 9398),
FR_FRA,
kPlatformMacintosh,
ADGF_NO_FLAGS,
diff --git a/engines/gob/detection/tables_littlered.h b/engines/gob/detection/tables_littlered.h
index 21aa9d4a04..6c25fa6e90 100644
--- a/engines/gob/detection/tables_littlered.h
+++ b/engines/gob/detection/tables_littlered.h
@@ -247,11 +247,8 @@
{
"littlered",
"",
- {
- {"intro.stk", 0, "0b72992f5d8b5e6e0330572a5753ea25", 256490},
- {"mod.babayaga", 0, "43484cde74e0860785f8e19f0bc776d1", 60248},
- {0, 0, 0, 0}
- },
+ AD_ENTRY2s("intro.stk", "0b72992f5d8b5e6e0330572a5753ea25", 256490,
+ "mod.babayaga", "43484cde74e0860785f8e19f0bc776d1", 60248),
UNK_LANG,
kPlatformAmiga,
ADGF_NO_FLAGS,
diff --git a/engines/gob/detection/tables_playtoons.h b/engines/gob/detection/tables_playtoons.h
index e495db9e25..aa56bb69f0 100644
--- a/engines/gob/detection/tables_playtoons.h
+++ b/engines/gob/detection/tables_playtoons.h
@@ -31,11 +31,8 @@
{
"playtoons1",
"",
- {
- {"playtoon.stk", 0, "8c98e9a11be9bb203a55e8c6e68e519b", 25574338},
- {"archi.stk", 0, "8d44b2a0d4e3139471213f9f0ed21e81", 5524674},
- {0, 0, 0, 0}
- },
+ AD_ENTRY2s("playtoon.stk", "8c98e9a11be9bb203a55e8c6e68e519b", 25574338,
+ "archi.stk", "8d44b2a0d4e3139471213f9f0ed21e81", 5524674),
FR_FRA,
kPlatformDOS,
ADGF_NO_FLAGS,
@@ -49,11 +46,8 @@
{
"playtoons1",
"Pack mes histoires anim\xE9""es",
- {
- {"playtoon.stk", 0, "55f0293202963854192e39474e214f5f", 30448474},
- {"archi.stk", 0, "8d44b2a0d4e3139471213f9f0ed21e81", 5524674},
- {0, 0, 0, 0}
- },
+ AD_ENTRY2s("playtoon.stk", "55f0293202963854192e39474e214f5f", 30448474,
+ "archi.stk", "8d44b2a0d4e3139471213f9f0ed21e81", 5524674),
FR_FRA,
kPlatformDOS,
ADGF_NO_FLAGS,
@@ -67,11 +61,8 @@
{
"playtoons1",
"",
- {
- {"playtoon.stk", 0, "c5ca2a288cdaefca9556cd9ae4b579cf", 25158926},
- {"archi.stk", 0, "8d44b2a0d4e3139471213f9f0ed21e81", 5524674},
- {0, 0, 0, 0}
- },
+ AD_ENTRY2s("playtoon.stk", "c5ca2a288cdaefca9556cd9ae4b579cf", 25158926,
+ "archi.stk", "8d44b2a0d4e3139471213f9f0ed21e81", 5524674),
DE_DEU,
kPlatformDOS,
ADGF_NO_FLAGS,
@@ -85,11 +76,8 @@
{
"playtoons1",
"",
- {
- {"playtoon.stk", 0, "9e513e993a5b0e2496add3f50c08764b", 30448506},
- {"archi.stk", 0, "00d8274519dfcf8a0d8ae3099daea0f8", 5532135},
- {0, 0, 0, 0}
- },
+ AD_ENTRY2s("playtoon.stk", "9e513e993a5b0e2496add3f50c08764b", 30448506,
+ "archi.stk", "00d8274519dfcf8a0d8ae3099daea0f8", 5532135),
EN_ANY,
kPlatformDOS,
ADGF_NO_FLAGS,
@@ -126,11 +114,8 @@
{
"playtoons1",
"Non-Interactive Demo",
- {
- {"e.scn", 0, "8a0db733c3f77be86e74e8242e5caa61", 124},
- {"demarchg.vmd", 0, "d14a95da7d8792faf5503f649ffcbc12", 5619415},
- {0, 0, 0, 0}
- },
+ AD_ENTRY2s("e.scn", "8a0db733c3f77be86e74e8242e5caa61", 124,
+ "demarchg.vmd", "d14a95da7d8792faf5503f649ffcbc12", 5619415),
EN_ANY,
kPlatformDOS,
ADGF_NO_FLAGS,
@@ -190,11 +175,8 @@
{
"playtoons2",
"",
- {
- {"playtoon.stk", 0, "4772c96be88a57f0561519e4a1526c62", 24406262},
- {"spirou.stk", 0, "5d9c7644d0c47840169b4d016765cc1a", 9816201},
- {0, 0, 0, 0}
- },
+ AD_ENTRY2s("playtoon.stk", "4772c96be88a57f0561519e4a1526c62", 24406262,
+ "spirou.stk", "5d9c7644d0c47840169b4d016765cc1a", 9816201),
EN_ANY,
kPlatformDOS,
ADGF_NO_FLAGS,
@@ -208,11 +190,8 @@
{
"playtoons2",
"",
- {
- {"playtoon.stk", 0, "55a85036dd93cce93532d8f743d90074", 17467154},
- {"spirou.stk", 0, "e3e1b6148dd72fafc3637f1a8e5764f5", 9812043},
- {0, 0, 0, 0}
- },
+ AD_ENTRY2s("playtoon.stk", "55a85036dd93cce93532d8f743d90074", 17467154,
+ "spirou.stk", "e3e1b6148dd72fafc3637f1a8e5764f5", 9812043),
FR_FRA,
kPlatformDOS,
ADGF_NO_FLAGS,
@@ -226,11 +205,8 @@
{
"playtoons2",
"",
- {
- {"playtoon.stk", 0, "8c98e9a11be9bb203a55e8c6e68e519b", 25574338},
- {"spirou.stk", 0, "91080dc148de1bbd6a97321c1a1facf3", 9817086},
- {0, 0, 0, 0}
- },
+ AD_ENTRY2s("playtoon.stk", "8c98e9a11be9bb203a55e8c6e68e519b", 25574338,
+ "spirou.stk", "91080dc148de1bbd6a97321c1a1facf3", 9817086),
FR_FRA,
kPlatformDOS,
ADGF_NO_FLAGS,
@@ -244,11 +220,8 @@
{
"playtoons2",
"",
- {
- {"playtoon.stk", 0, "c5ca2a288cdaefca9556cd9ae4b579cf", 25158926},
- {"spirou.stk", 0, "91080dc148de1bbd6a97321c1a1facf3", 9817086},
- {0, 0, 0, 0}
- },
+ AD_ENTRY2s("playtoon.stk", "c5ca2a288cdaefca9556cd9ae4b579cf", 25158926,
+ "spirou.stk", "91080dc148de1bbd6a97321c1a1facf3", 9817086),
DE_DEU,
kPlatformDOS,
ADGF_NO_FLAGS,
@@ -262,11 +235,8 @@
{
"playtoons2",
"",
- {
- {"playtoon.stk", 0, "2572685400852d12759a2fbf09ec88eb", 9698780},
- {"spirou.stk", 0, "d3cfeff920b6343a2ece55088f530dba", 7076608},
- {0, 0, 0, 0}
- },
+ AD_ENTRY2s("playtoon.stk", "2572685400852d12759a2fbf09ec88eb", 9698780,
+ "spirou.stk", "d3cfeff920b6343a2ece55088f530dba", 7076608),
IT_ITA,
kPlatformDOS,
ADGF_NO_FLAGS,
@@ -280,11 +250,8 @@
{
"playtoons2",
"",
- {
- {"playtoon.stk", 0, "9e513e993a5b0e2496add3f50c08764b", 30448506},
- {"spirou.stk", 0, "993737f112ca6a9b33c814273280d832", 9825760},
- {0, 0, 0, 0}
- },
+ AD_ENTRY2s("playtoon.stk", "9e513e993a5b0e2496add3f50c08764b", 30448506,
+ "spirou.stk", "993737f112ca6a9b33c814273280d832", 9825760),
EN_ANY,
kPlatformDOS,
ADGF_NO_FLAGS,
@@ -301,11 +268,8 @@
{
"playtoons3",
"",
- {
- {"playtoon.stk", 0, "8c98e9a11be9bb203a55e8c6e68e519b", 25574338},
- {"chato.stk", 0, "4fa4ed96a427c344e9f916f9f236598d", 6033793},
- {0, 0, 0, 0}
- },
+ AD_ENTRY2s("playtoon.stk", "8c98e9a11be9bb203a55e8c6e68e519b", 25574338,
+ "chato.stk", "4fa4ed96a427c344e9f916f9f236598d", 6033793),
FR_FRA,
kPlatformDOS,
ADGF_NO_FLAGS,
@@ -319,11 +283,8 @@
{
"playtoons3",
"",
- {
- {"playtoon.stk", 0, "9e513e993a5b0e2496add3f50c08764b", 30448506},
- {"chato.stk", 0, "8fc8d0da5b3e758908d1d7298d497d0b", 6041026},
- {0, 0, 0, 0}
- },
+ AD_ENTRY2s("playtoon.stk", "9e513e993a5b0e2496add3f50c08764b", 30448506,
+ "chato.stk", "8fc8d0da5b3e758908d1d7298d497d0b", 6041026),
EN_ANY,
kPlatformDOS,
ADGF_NO_FLAGS,
@@ -337,11 +298,8 @@
{
"playtoons3",
"Pack mes histoires anim\xE9""es",
- {
- {"playtoon.stk", 0, "55f0293202963854192e39474e214f5f", 30448474},
- {"chato.stk", 0, "4fa4ed96a427c344e9f916f9f236598d", 6033793},
- {0, 0, 0, 0}
- },
+ AD_ENTRY2s("playtoon.stk", "55f0293202963854192e39474e214f5f", 30448474,
+ "chato.stk", "4fa4ed96a427c344e9f916f9f236598d", 6033793),
FR_FRA,
kPlatformDOS,
ADGF_NO_FLAGS,
@@ -355,11 +313,8 @@
{
"playtoons3",
"",
- {
- {"playtoon.stk", 0, "c5ca2a288cdaefca9556cd9ae4b579cf", 25158926},
- {"chato.stk", 0, "3c6cb3ac8a5a7cf681a19971a92a748d", 6033791},
- {0, 0, 0, 0}
- },
+ AD_ENTRY2s("playtoon.stk", "c5ca2a288cdaefca9556cd9ae4b579cf", 25158926,
+ "chato.stk", "3c6cb3ac8a5a7cf681a19971a92a748d", 6033791),
DE_DEU,
kPlatformDOS,
ADGF_NO_FLAGS,
@@ -373,11 +328,8 @@
{
"playtoons3",
"",
- {
- {"playtoon.stk", 0, "4772c96be88a57f0561519e4a1526c62", 24406262},
- {"chato.stk", 0, "bdef407387112bfcee90e664865ac3af", 6033867},
- {0, 0, 0, 0}
- },
+ AD_ENTRY2s("playtoon.stk", "4772c96be88a57f0561519e4a1526c62", 24406262,
+ "chato.stk", "bdef407387112bfcee90e664865ac3af", 6033867),
EN_ANY,
kPlatformDOS,
ADGF_NO_FLAGS,
@@ -394,11 +346,8 @@
{
"playtoons4",
"",
- {
- {"playtoon.stk", 0, "b7f5afa2dc1b0f75970b7c07d175db1b", 24340406},
- {"manda.stk", 0, "92529e0b927191d9898a34c2892e9a3a", 6485072},
- {0, 0, 0, 0}
- },
+ AD_ENTRY2s("playtoon.stk", "b7f5afa2dc1b0f75970b7c07d175db1b", 24340406,
+ "manda.stk", "92529e0b927191d9898a34c2892e9a3a", 6485072),
FR_FRA,
kPlatformDOS,
ADGF_NO_FLAGS,
@@ -412,11 +361,8 @@
{
"playtoons4",
"",
- {
- {"playtoon.stk", 0, "9e513e993a5b0e2496add3f50c08764b", 30448506},
- {"manda.stk", 0, "69a79c9f61b2618e482726f2ff68078d", 6499208},
- {0, 0, 0, 0}
- },
+ AD_ENTRY2s("playtoon.stk", "9e513e993a5b0e2496add3f50c08764b", 30448506,
+ "manda.stk", "69a79c9f61b2618e482726f2ff68078d", 6499208),
EN_ANY,
kPlatformDOS,
ADGF_NO_FLAGS,
@@ -433,11 +379,8 @@
{
"playtoons5",
"",
- {
- {"playtoon.stk", 0, "55f0293202963854192e39474e214f5f", 30448474},
- {"wakan.stk", 0, "f493bf82851bc5ba74d57de6b7e88df8", 5520153},
- {0, 0, 0, 0}
- },
+ AD_ENTRY2s("playtoon.stk", "55f0293202963854192e39474e214f5f", 30448474,
+ "wakan.stk", "f493bf82851bc5ba74d57de6b7e88df8", 5520153),
FR_FRA,
kPlatformDOS,
ADGF_NO_FLAGS,
@@ -454,11 +397,8 @@
{
"playtnck1",
"",
- {
- {"playtoon.stk", 0, "5f9aae29265f1f105ad8ec195dff81de", 68382024},
- {"dan.itk", 0, "906d67b3e438d5e95ec7ea9e781a94f3", 3000320},
- {0, 0, 0, 0}
- },
+ AD_ENTRY2s("playtoon.stk", "5f9aae29265f1f105ad8ec195dff81de", 68382024,
+ "dan.itk", "906d67b3e438d5e95ec7ea9e781a94f3", 3000320),
FR_FRA,
kPlatformDOS,
ADGF_NO_FLAGS,
@@ -475,11 +415,8 @@
{
"playtnck2",
"",
- {
- {"playtoon.stk", 0, "5f9aae29265f1f105ad8ec195dff81de", 68382024},
- {"dan.itk", 0, "74eeb075bd2cb47b243349730264af01", 3213312},
- {0, 0, 0, 0}
- },
+ AD_ENTRY2s("playtoon.stk", "5f9aae29265f1f105ad8ec195dff81de", 68382024,
+ "dan.itk", "74eeb075bd2cb47b243349730264af01", 3213312),
FR_FRA,
kPlatformDOS,
ADGF_NO_FLAGS,
@@ -496,11 +433,8 @@
{
"playtnck3",
"",
- {
- {"playtoon.stk", 0, "5f9aae29265f1f105ad8ec195dff81de", 68382024},
- {"dan.itk", 0, "9a8f62809eca5a52f429b5b6a8e70f8f", 2861056},
- {0, 0, 0, 0}
- },
+ AD_ENTRY2s("playtoon.stk", "5f9aae29265f1f105ad8ec195dff81de", 68382024,
+ "dan.itk", "9a8f62809eca5a52f429b5b6a8e70f8f", 2861056),
FR_FRA,
kPlatformDOS,
ADGF_NO_FLAGS,
@@ -517,11 +451,8 @@
{
"bambou",
"",
- {
- {"intro.stk", 0, "2f8db6963ff8d72a8331627ebda918f4", 3613238},
- {"bambou.itk", 0, "0875914d31126d0749313428f10c7768", 114440192},
- {0, 0, 0, 0}
- },
+ AD_ENTRY2s("intro.stk", "2f8db6963ff8d72a8331627ebda918f4", 3613238,
+ "bambou.itk", "0875914d31126d0749313428f10c7768", 114440192),
FR_FRA,
kPlatformDOS,
ADGF_NO_FLAGS,
diff --git a/engines/gob/detection/tables_woodruff.h b/engines/gob/detection/tables_woodruff.h
index 737c9a771c..00ce5a4fa7 100644
--- a/engines/gob/detection/tables_woodruff.h
+++ b/engines/gob/detection/tables_woodruff.h
@@ -370,11 +370,8 @@
{
"woodruff",
"Non-Interactive Demo",
- {
- {"demo.scn", 0, "16bb85fc5f8e519147b60475dbf33962", 89},
- {"wooddem3.vmd", 0, "a1700596172c2d4e264760030c3a3d47", 8994250},
- {0, 0, 0, 0}
- },
+ AD_ENTRY2s("demo.scn", "16bb85fc5f8e519147b60475dbf33962", 89,
+ "wooddem3.vmd", "a1700596172c2d4e264760030c3a3d47", 8994250),
EN_ANY,
kPlatformDOS,
ADGF_NO_FLAGS,
Commit: 9e73c49e2bc91bfcff815b66d3eb4c762da34f30
https://github.com/scummvm/scummvm/commit/9e73c49e2bc91bfcff815b66d3eb4c762da34f30
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-28T14:44:06+01:00
Commit Message:
GRIM: Use AD_ENTRY2s in the detection table. That also fixes OOB access
Changed paths:
engines/grim/detection.cpp
diff --git a/engines/grim/detection.cpp b/engines/grim/detection.cpp
index 712f9f11bc..dd8857bcd4 100644
--- a/engines/grim/detection.cpp
+++ b/engines/grim/detection.cpp
@@ -262,10 +262,8 @@ static const GrimGameDescription gameDescriptions[] = {
{
"grim",
"Demo",
- {
- {"gfdemo01.lab", 0, "7df813f3809f2c0234213cfa4f6da062", 29533695},
- {"voice001.lab", 0, "7df474e03c23692ed02e4ce45f1a6b30", 13764168},
- },
+ AD_ENTRY2s("gfdemo01.lab", "7df813f3809f2c0234213cfa4f6da062", 29533695,
+ "voice001.lab", "7df474e03c23692ed02e4ce45f1a6b30", 13764168),
Common::FR_FRA,
Common::kPlatformWindows,
ADGF_DEMO,
@@ -279,10 +277,8 @@ static const GrimGameDescription gameDescriptions[] = {
{
"grim",
"Demo",
- {
- {"gfdemo01.lab", 0, "7df813f3809f2c0234213cfa4f6da062", 29533695},
- {"voice001.lab", 0, "2788dc7fd226787f3a68ac9c853d2580", 16561196},
- },
+ AD_ENTRY2s("gfdemo01.lab", "7df813f3809f2c0234213cfa4f6da062", 29533695,
+ "voice001.lab", "2788dc7fd226787f3a68ac9c853d2580", 16561196),
Common::DE_DEU,
Common::kPlatformWindows,
ADGF_DEMO,
@@ -296,10 +292,8 @@ static const GrimGameDescription gameDescriptions[] = {
{
"grim",
"Demo",
- {
- {"gfdemo01.lab", 0, "7df813f3809f2c0234213cfa4f6da062", 29533695},
- {"voice001.lab", 0, "3b8ace62584380c66b73981e014ea40e", 14907410},
- },
+ AD_ENTRY2s("gfdemo01.lab", "7df813f3809f2c0234213cfa4f6da062", 29533695,
+ "voice001.lab", "3b8ace62584380c66b73981e014ea40e", 14907410),
Common::IT_ITA,
Common::kPlatformWindows,
ADGF_DEMO,
@@ -313,10 +307,8 @@ static const GrimGameDescription gameDescriptions[] = {
{
"grim",
"Demo",
- {
- {"gfdemo01.lab", 0, "7df813f3809f2c0234213cfa4f6da062", 29533695},
- {"voice001.lab", 0, "a810ec11acaf9d76cd04d2f68fcdc912", 13367206},
- },
+ AD_ENTRY2s("gfdemo01.lab", "7df813f3809f2c0234213cfa4f6da062", 29533695,
+ "voice001.lab", "a810ec11acaf9d76cd04d2f68fcdc912", 13367206),
Common::ES_ESP,
Common::kPlatformWindows,
ADGF_DEMO,
@@ -434,11 +426,8 @@ static const GrimGameDescription gameDescriptions[] = {
{
"monkey4",
"",
- {
- {"artAll.m4b", 0, "007a33881478be6b6e0228d8888536ae", 18512568},
- {"EFMI Installer", 0, "54298c7440dafedf33d2b27c7bb24052", 9241784},
- AD_LISTEND
- },
+ AD_ENTRY2s("artAll.m4b", "007a33881478be6b6e0228d8888536ae", 18512568,
+ "EFMI Installer", "54298c7440dafedf33d2b27c7bb24052", 9241784),
Common::DE_DEU,
Common::kPlatformMacintosh,
ADGF_UNSTABLE,
@@ -516,11 +505,8 @@ static const GrimGameDescription gameDescriptions[] = {
{
"monkey4",
"Demo",
- {
- {"magdemo.lab", 0, "9e7eaa1b9317ff47d5deeda0b2c42ce3", 19826116},
- {"i9n.lab", 0, "274f8579b01e0872fe6f1ba267266149", 26951},
- AD_LISTEND
- },
+ AD_ENTRY2s("magdemo.lab", "9e7eaa1b9317ff47d5deeda0b2c42ce3", 19826116,
+ "i9n.lab", "274f8579b01e0872fe6f1ba267266149", 26951),
Common::EN_ANY,
Common::kPlatformWindows,
ADGF_DEMO | ADGF_UNSTABLE,
@@ -533,11 +519,8 @@ static const GrimGameDescription gameDescriptions[] = {
{
"monkey4",
"Demo",
- {
- {"magdemo.lab", 0, "9e7eaa1b9317ff47d5deeda0b2c42ce3", 19826116},
- {"i9n.lab", 0, "7f1744990472261bdcbc02036ba9f7ec", 1718385},
- AD_LISTEND
- },
+ AD_ENTRY2s("magdemo.lab", "9e7eaa1b9317ff47d5deeda0b2c42ce3", 19826116,
+ "i9n.lab", "7f1744990472261bdcbc02036ba9f7ec", 1718385),
Common::FR_FRA,
Common::kPlatformWindows,
ADGF_DEMO | ADGF_UNSTABLE,
@@ -551,11 +534,8 @@ static const GrimGameDescription gameDescriptions[] = {
{
"monkey4",
"Demo",
- {
- {"magdemo.lab", 0, "9e7eaa1b9317ff47d5deeda0b2c42ce3", 19826116},
- {"i9n.lab", 0, "28f6bc270b5c31970cc110c7656ff598", 1749051},
- AD_LISTEND
- },
+ AD_ENTRY2s("magdemo.lab", "9e7eaa1b9317ff47d5deeda0b2c42ce3", 19826116,
+ "i9n.lab", "28f6bc270b5c31970cc110c7656ff598", 1749051),
Common::DE_DEU,
Common::kPlatformWindows,
ADGF_DEMO | ADGF_UNSTABLE,
@@ -569,11 +549,8 @@ static const GrimGameDescription gameDescriptions[] = {
{
"monkey4",
"Demo",
- {
- {"magdemo.lab", 0, "9e7eaa1b9317ff47d5deeda0b2c42ce3", 19826116},
- {"i9n.lab", 0, "53b20d930f6e8c2e0880ed7e336eeebc", 1740761},
- AD_LISTEND
- },
+ AD_ENTRY2s("magdemo.lab", "9e7eaa1b9317ff47d5deeda0b2c42ce3", 19826116,
+ "i9n.lab", "53b20d930f6e8c2e0880ed7e336eeebc", 1740761),
Common::ES_ESP,
Common::kPlatformWindows,
ADGF_DEMO | ADGF_UNSTABLE,
Commit: 6b48712d1d866738beea168bbe3c44ccd0864210
https://github.com/scummvm/scummvm/commit/6b48712d1d866738beea168bbe3c44ccd0864210
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-28T14:52:46+01:00
Commit Message:
GROOVIE: Use AD_ENTRY2s in the detection tables
Changed paths:
engines/groovie/detection.cpp
diff --git a/engines/groovie/detection.cpp b/engines/groovie/detection.cpp
index b67ab542d5..ecd9161f2f 100644
--- a/engines/groovie/detection.cpp
+++ b/engines/groovie/detection.cpp
@@ -152,11 +152,8 @@ static const GroovieGameDescription gameDescriptions[] = {
{
{
"11h", "",
- {
- { "disk.1", 0, "5c0428cd3659fc7bbcd0aa16485ed5da", 227 },
- { "The 11th Hour Installer", 0, "bcdb4040b27f15b18f39fb9e496d384a", 1002987 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("disk.1", "5c0428cd3659fc7bbcd0aa16485ed5da", 227,
+ "The 11th Hour Installer", "bcdb4040b27f15b18f39fb9e496d384a", 1002987),
Common::EN_ANY, Common::kPlatformMacintosh, ADGF_UNSTABLE,
GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_NOASPECT)
},
@@ -167,11 +164,8 @@ static const GroovieGameDescription gameDescriptions[] = {
{
{
"11h", "Installed",
- {
- { "disk.1", 0, "5c0428cd3659fc7bbcd0aa16485ed5da", 227 },
- { "el01.mov", 0, "70f42dfc25b1488a08011dc45bb5145d", 6039 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("disk.1", "5c0428cd3659fc7bbcd0aa16485ed5da", 227,
+ "el01.mov", "70f42dfc25b1488a08011dc45bb5145d", 6039),
Common::EN_ANY, Common::kPlatformMacintosh, ADGF_UNSTABLE,
GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_NOASPECT)
},
@@ -204,11 +198,8 @@ static const GroovieGameDescription gameDescriptions[] = {
{
{
"11h", "Making Of",
- {
- { "disk.1", 0, "5c0428cd3659fc7bbcd0aa16485ed5da", 227 },
- { "The 11th Hour Installer", 0, "bcdb4040b27f15b18f39fb9e496d384a", 1002987 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("disk.1", "5c0428cd3659fc7bbcd0aa16485ed5da", 227,
+ "The 11th Hour Installer", "bcdb4040b27f15b18f39fb9e496d384a", 1002987),
Common::EN_ANY, Common::kPlatformMacintosh, ADGF_UNSTABLE,
GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_NOASPECT)
},
@@ -219,11 +210,8 @@ static const GroovieGameDescription gameDescriptions[] = {
{
{
"11h", "Making Of (Installed)",
- {
- { "disk.1", 0, "5c0428cd3659fc7bbcd0aa16485ed5da", 227 },
- { "el01.mov", 0, "70f42dfc25b1488a08011dc45bb5145d", 6039 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("disk.1", "5c0428cd3659fc7bbcd0aa16485ed5da", 227,
+ "el01.mov", "70f42dfc25b1488a08011dc45bb5145d", 6039),
Common::EN_ANY, Common::kPlatformMacintosh, ADGF_UNSTABLE,
GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_NOASPECT)
},
@@ -245,11 +233,8 @@ static const GroovieGameDescription gameDescriptions[] = {
{
{
"clandestiny", "Trailer",
- {
- { "disk.1", 0, "5c0428cd3659fc7bbcd0aa16485ed5da", 227 },
- { "The 11th Hour Installer", 0, "bcdb4040b27f15b18f39fb9e496d384a", 1002987 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("disk.1", "5c0428cd3659fc7bbcd0aa16485ed5da", 227,
+ "The 11th Hour Installer", "bcdb4040b27f15b18f39fb9e496d384a", 1002987),
Common::EN_ANY, Common::kPlatformMacintosh, ADGF_UNSTABLE,
GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_NOASPECT)
},
@@ -260,11 +245,8 @@ static const GroovieGameDescription gameDescriptions[] = {
{
{
"clandestiny", "Trailer (Installed)",
- {
- { "disk.1", 0, "5c0428cd3659fc7bbcd0aa16485ed5da", 227 },
- { "el01.mov", 0, "70f42dfc25b1488a08011dc45bb5145d", 6039 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("disk.1", "5c0428cd3659fc7bbcd0aa16485ed5da", 227,
+ "el01.mov", "70f42dfc25b1488a08011dc45bb5145d", 6039),
Common::EN_ANY, Common::kPlatformMacintosh, ADGF_UNSTABLE,
GUIO4(GUIO_MIDIADLIB, GUIO_MIDIMT32, GUIO_MIDIGM, GUIO_NOASPECT)
},
Commit: eb6d80b4eb0604540166ddaaa54f26fdb3a29035
https://github.com/scummvm/scummvm/commit/eb6d80b4eb0604540166ddaaa54f26fdb3a29035
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-28T14:53:06+01:00
Commit Message:
HOPKINS: Use macros in the detection tables
Changed paths:
engines/hopkins/detection_tables.h
diff --git a/engines/hopkins/detection_tables.h b/engines/hopkins/detection_tables.h
index e973218f3d..b4335426a0 100644
--- a/engines/hopkins/detection_tables.h
+++ b/engines/hopkins/detection_tables.h
@@ -31,10 +31,7 @@ static const HopkinsGameDescription gameDescriptions[] = {
{
"hopkins",
"Linux Demo",
- {
- {"RES_VAN.RES", 0, "29414c05be8f9fe794c61572a65def12", 16060544},
- AD_LISTEND
- },
+ AD_ENTRY1s("RES_VAN.RES", "29414c05be8f9fe794c61572a65def12", 16060544),
Common::EN_ANY,
Common::kPlatformLinux,
ADGF_DEMO,
@@ -46,11 +43,8 @@ static const HopkinsGameDescription gameDescriptions[] = {
{
"hopkins",
0,
- {
- {"ENG_VOI.RES", 0, "fa5789d1d8c19d160bce44a33e742fdf", 66860711},
- {"CREAN.TXT", 0, "e13aa69d9e043f066776e1d0ef98fdf5", 1871},
- AD_LISTEND
- },
+ AD_ENTRY2s("ENG_VOI.RES", "fa5789d1d8c19d160bce44a33e742fdf", 66860711,
+ "CREAN.TXT", "e13aa69d9e043f066776e1d0ef98fdf5", 1871),
Common::EN_ANY,
Common::kPlatformOS2,
ADGF_NO_FLAGS,
@@ -62,10 +56,7 @@ static const HopkinsGameDescription gameDescriptions[] = {
{
"hopkins",
0,
- {
- {"ENG_VOI.RES", 0, "fa5789d1d8c19d160bce44a33e742fdf", 66860711},
- AD_LISTEND
- },
+ AD_ENTRY1s("ENG_VOI.RES", "fa5789d1d8c19d160bce44a33e742fdf", 66860711),
Common::EN_ANY,
Common::kPlatformBeOS,
ADGF_NO_FLAGS,
@@ -77,10 +68,7 @@ static const HopkinsGameDescription gameDescriptions[] = {
{
"hopkins",
0,
- {
- {"RES_VES.RES", 0, "77ee08896466ae88cc1af3bf1a0bf78c", 32882302},
- AD_LISTEND
- },
+ AD_ENTRY1s("RES_VES.RES", "77ee08896466ae88cc1af3bf1a0bf78c", 32882302),
Common::ES_ESP,
Common::kPlatformWindows,
ADGF_NO_FLAGS,
@@ -92,10 +80,7 @@ static const HopkinsGameDescription gameDescriptions[] = {
{
"hopkins",
0,
- {
- {"RES_VAN.RES", 0, "f1693ac0b0859c8ecd8cb30ff43cf55f", 38296346},
- AD_LISTEND
- },
+ AD_ENTRY1s("RES_VAN.RES", "f1693ac0b0859c8ecd8cb30ff43cf55f", 38296346),
Common::EN_ANY,
Common::kPlatformWindows,
ADGF_NO_FLAGS,
@@ -107,10 +92,7 @@ static const HopkinsGameDescription gameDescriptions[] = {
{
"hopkins",
0,
- {
- {"res_van.res", 0, "bf17c710e184a25a6c8e9d1d9503c38e", 32197685},
- AD_LISTEND
- },
+ AD_ENTRY1s("res_van.res", "bf17c710e184a25a6c8e9d1d9503c38e", 32197685),
Common::RU_RUS,
Common::kPlatformWindows,
ADGF_NO_FLAGS,
@@ -122,10 +104,7 @@ static const HopkinsGameDescription gameDescriptions[] = {
{
"hopkins",
0,
- {
- {"RES_VFR.RES", 0, "0490d4d1aa71075ebf71cc79e5dc7894", 39817945},
- AD_LISTEND
- },
+ AD_ENTRY1s("RES_VFR.RES", "0490d4d1aa71075ebf71cc79e5dc7894", 39817945),
Common::FR_FRA,
Common::kPlatformLinux,
ADGF_NO_FLAGS,
@@ -137,10 +116,7 @@ static const HopkinsGameDescription gameDescriptions[] = {
{
"hopkins",
0,
- {
- {"RES_VAN.RES", 0, "29414c05be8f9fe794c61572a65def12", 38832455},
- AD_LISTEND
- },
+ AD_ENTRY1s("RES_VAN.RES", "29414c05be8f9fe794c61572a65def12", 38832455),
Common::EN_ANY,
Common::kPlatformLinux,
ADGF_NO_FLAGS,
@@ -152,10 +128,7 @@ static const HopkinsGameDescription gameDescriptions[] = {
{
"hopkins",
0,
- {
- {"RES_VFR.RES", 0, "b8a3849063c9eeefe80e82cfce1ad3cd", 39269361},
- AD_LISTEND
- },
+ AD_ENTRY1s("RES_VFR.RES", "b8a3849063c9eeefe80e82cfce1ad3cd", 39269361),
Common::FR_FRA,
Common::kPlatformWindows,
ADGF_NO_FLAGS,
@@ -168,10 +141,7 @@ static const HopkinsGameDescription gameDescriptions[] = {
{
"hopkins",
0,
- {
- {"RES_VAN.RES", 0, "f2fec5172e4a7a9d35cb2a5f948ef6a9", 39400865},
- AD_LISTEND
- },
+ AD_ENTRY1s("RES_VAN.RES", "f2fec5172e4a7a9d35cb2a5f948ef6a9", 39400865),
Common::PL_POL,
Common::kPlatformWindows,
ADGF_NO_FLAGS,
@@ -185,10 +155,7 @@ static const HopkinsGameDescription gameDescriptions[] = {
{
"hopkins",
"Win95 Demo",
- {
- {"Hopkins.exe", 0, "0c9ebfe371f4dcf84a49f333f04839a0", 376897},
- AD_LISTEND
- },
+ AD_ENTRY1s("Hopkins.exe", "0c9ebfe371f4dcf84a49f333f04839a0", 376897),
Common::EN_ANY,
Common::kPlatformWindows,
ADGF_DEMO,
@@ -200,10 +167,7 @@ static const HopkinsGameDescription gameDescriptions[] = {
{
"hopkins",
"Win95 Demo",
- {
- {"RES_VAN.RES", 0, "8262cfba261c200af4451902689dffe0", 12233202},
- AD_LISTEND
- },
+ AD_ENTRY1s("RES_VAN.RES", "8262cfba261c200af4451902689dffe0", 12233202),
Common::PL_POL,
Common::kPlatformWindows,
ADGF_DEMO,
Commit: c6ca91ba4489bbe7440d961b3b51b878c0c97c3e
https://github.com/scummvm/scummvm/commit/c6ca91ba4489bbe7440d961b3b51b878c0c97c3e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-28T15:23:31+01:00
Commit Message:
KYRA: Use macros in detection tables
Changed paths:
engines/kyra/detection_tables.h
diff --git a/engines/kyra/detection_tables.h b/engines/kyra/detection_tables.h
index 0410166f0b..dc338ee4b4 100644
--- a/engines/kyra/detection_tables.h
+++ b/engines/kyra/detection_tables.h
@@ -222,11 +222,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"kyra1",
0,
- {
- { "GEMCUT.PAK", 0, "2bd1da653eaefd691e050e4a9eb68a64", -1 },
- { "GEMCUT.EMC", 0, "2a3f44e179f1e9f7643e90083c747571", -1 },
- { NULL, 0, NULL, 0 }
- },
+ AD_ENTRY2s("GEMCUT.PAK", "2bd1da653eaefd691e050e4a9eb68a64", -1,
+ "GEMCUT.EMC", "2a3f44e179f1e9f7643e90083c747571", -1),
Common::EN_ANY,
Common::kPlatformAmiga,
ADGF_NO_FLAGS,
@@ -239,11 +236,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"kyra1",
0,
- {
- { "GEMCUT.PAK", 0, "2bd1da653eaefd691e050e4a9eb68a64", -1 },
- { "GEMCUT.EMC", 0, "74f99e9ed99abf8d0429826d78485a2a", -1 },
- { NULL, 0, NULL, 0 }
- },
+ AD_ENTRY2s("GEMCUT.PAK", "2bd1da653eaefd691e050e4a9eb68a64", -1,
+ "GEMCUT.EMC", "74f99e9ed99abf8d0429826d78485a2a", -1),
Common::DE_DEU,
Common::kPlatformAmiga,
ADGF_NO_FLAGS,
@@ -256,11 +250,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"kyra1",
0,
- {
- { "GEMCUT.EMC", 0, "796e44863dd22fa635b042df1bf16673", -1 },
- { "BEAD.CPS", 0, "3038466f65b7751451844707187aa401", -1 },
- { NULL, 0, NULL, 0 }
- },
+ AD_ENTRY2s("GEMCUT.EMC", "796e44863dd22fa635b042df1bf16673", -1,
+ "BEAD.CPS", "3038466f65b7751451844707187aa401", -1),
Common::EN_ANY,
Common::kPlatformMacintosh,
ADGF_NO_FLAGS,
@@ -273,11 +264,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"kyra1",
0,
- {
- { "EMC.PAK", 0, "a046bb0b422061aab8e4c4689400343a", -1 },
- { "TWMUSIC.PAK", 0, "e53bca3a3e3fb49107d59463ec387a59", -1 },
- { NULL, 0, NULL, 0 }
- },
+ AD_ENTRY2s("EMC.PAK", "a046bb0b422061aab8e4c4689400343a", -1,
+ "TWMUSIC.PAK", "e53bca3a3e3fb49107d59463ec387a59", -1),
Common::EN_ANY,
Common::kPlatformFMTowns,
ADGF_NO_FLAGS,
@@ -289,11 +277,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"kyra1",
0,
- {
- { "JMC.PAK", 0, "9c5707a2a478e8167e44283246612d2c", -1 },
- { "TWMUSIC.PAK", 0, "e53bca3a3e3fb49107d59463ec387a59", -1 },
- { NULL, 0, NULL, 0 }
- },
+ AD_ENTRY2s("JMC.PAK", "9c5707a2a478e8167e44283246612d2c", -1,
+ "TWMUSIC.PAK", "e53bca3a3e3fb49107d59463ec387a59", -1),
Common::JA_JPN,
Common::kPlatformFMTowns,
ADGF_NO_FLAGS,
@@ -308,11 +293,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"kyra1",
"",
- {
- { "JMC.PAK", 0, "9c5707a2a478e8167e44283246612d2c", -1 },
- { "MUSIC98.PAK", 0, "02fc212f799331b769b274e33d87b37f", -1 },
- { NULL, 0, NULL, 0 }
- },
+ AD_ENTRY2s("JMC.PAK", "9c5707a2a478e8167e44283246612d2c", -1,
+ "MUSIC98.PAK", "02fc212f799331b769b274e33d87b37f", -1),
Common::JA_JPN,
Common::kPlatformPC98,
ADGF_NO_FLAGS,
@@ -388,11 +370,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"kyra1",
"CD",
- {
- { "GEMCUT.PAK", 0, "d3d4b281cd357230aabcec46843d04bd", -1 },
- { "BEAD.CPS", 0, "3038466f65b7751451844707187aa401", -1 },
- { NULL, 0, NULL, 0 }
- },
+ AD_ENTRY2s("GEMCUT.PAK", "d3d4b281cd357230aabcec46843d04bd", -1,
+ "BEAD.CPS", "3038466f65b7751451844707187aa401", -1),
Common::EN_ANY,
Common::kPlatformMacintosh,
ADGF_CD,
@@ -404,11 +383,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"kyra1",
"CD",
- {
- { "GEMCUT.PAK", 0, "8ddf09fd6bfafdb27b4cf31c5a6fc91d", -1 },
- { "BEAD.CPS", 0, "3038466f65b7751451844707187aa401", -1 },
- { NULL, 0, NULL, 0 }
- },
+ AD_ENTRY2s("GEMCUT.PAK", "8ddf09fd6bfafdb27b4cf31c5a6fc91d", -1,
+ "BEAD.CPS", "3038466f65b7751451844707187aa401", -1),
Common::EN_ANY,
Common::kPlatformMacintosh,
ADGF_CD,
@@ -420,11 +396,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"kyra1",
"CD",
- {
- { "GEMCUT.PAK", 0, "4a0cb720e824295bcbccbd1407652110", -1 },
- { "BEAD.CPS", 0, "3038466f65b7751451844707187aa401", -1 },
- { NULL, 0, NULL, 0 }
- },
+ AD_ENTRY2s("GEMCUT.PAK", "4a0cb720e824295bcbccbd1407652110", -1,
+ "BEAD.CPS", "3038466f65b7751451844707187aa401", -1),
Common::DE_DEU,
Common::kPlatformMacintosh,
ADGF_CD,
@@ -436,11 +409,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"kyra1",
"CD",
- {
- { "GEMCUT.PAK", 0, "b71ee090aa12e80ed2ba068826d92bed", -1 },
- { "BEAD.CPS", 0, "3038466f65b7751451844707187aa401", -1 },
- { NULL, 0, NULL, 0 }
- },
+ AD_ENTRY2s("GEMCUT.PAK", "b71ee090aa12e80ed2ba068826d92bed", -1,
+ "BEAD.CPS", "3038466f65b7751451844707187aa401", -1),
Common::FR_FRA,
Common::kPlatformMacintosh,
ADGF_CD,
@@ -853,11 +823,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"kyra3",
0,
- {
- { "ONETIME.PAK", 0, "3833ff312757b8e6147f464cca0a6587", -1 },
- { "WESTWOOD.001", 0, 0, -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("ONETIME.PAK", "3833ff312757b8e6147f464cca0a6587", -1,
+ "WESTWOOD.001", 0, -1),
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_DROPLANGUAGE,
@@ -869,11 +836,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"kyra3",
0,
- {
- { "ONETIME.PAK", 0, "3833ff312757b8e6147f464cca0a6587", -1 },
- { "WESTWOOD.001", 0, 0, -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("ONETIME.PAK", "3833ff312757b8e6147f464cca0a6587", -1,
+ "WESTWOOD.001", 0, -1),
Common::DE_DEU,
Common::kPlatformDOS,
ADGF_DROPLANGUAGE,
@@ -885,11 +849,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"kyra3",
0,
- {
- { "ONETIME.PAK", 0, "3833ff312757b8e6147f464cca0a6587", -1 },
- { "WESTWOOD.001", 0, 0, -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("ONETIME.PAK", "3833ff312757b8e6147f464cca0a6587", -1,
+ "WESTWOOD.001", 0, -1),
Common::FR_FRA,
Common::kPlatformDOS,
ADGF_DROPLANGUAGE,
@@ -903,11 +864,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"kyra3",
0,
- {
- { "ONETIME.PAK", 0, "3833ff312757b8e6147f464cca0a6587", -1 },
- { "AUD.PAK", 0, 0, -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("ONETIME.PAK", "3833ff312757b8e6147f464cca0a6587", -1,
+ "AUD.PAK", 0, -1),
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_DROPLANGUAGE,
@@ -919,11 +877,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"kyra3",
0,
- {
- { "ONETIME.PAK", 0, "3833ff312757b8e6147f464cca0a6587", -1 },
- { "AUD.PAK", 0, 0, -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("ONETIME.PAK", "3833ff312757b8e6147f464cca0a6587", -1,
+ "AUD.PAK", 0, -1),
Common::DE_DEU,
Common::kPlatformDOS,
ADGF_DROPLANGUAGE,
@@ -935,11 +890,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"kyra3",
0,
- {
- { "ONETIME.PAK", 0, "3833ff312757b8e6147f464cca0a6587", -1 },
- { "AUD.PAK", 0, 0, -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("ONETIME.PAK", "3833ff312757b8e6147f464cca0a6587", -1,
+ "AUD.PAK", 0, -1),
Common::FR_FRA,
Common::kPlatformDOS,
ADGF_DROPLANGUAGE,
@@ -953,11 +905,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"kyra3",
0,
- {
- { "ONETIME.PAK", 0, "3833ff312757b8e6147f464cca0a6587", -1 },
- { "AUD.PAK", 0, 0, -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("ONETIME.PAK", "3833ff312757b8e6147f464cca0a6587", -1,
+ "AUD.PAK", 0, -1),
Common::EN_ANY,
Common::kPlatformMacintosh,
ADGF_DROPLANGUAGE,
@@ -969,11 +918,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"kyra3",
0,
- {
- { "ONETIME.PAK", 0, "3833ff312757b8e6147f464cca0a6587", -1 },
- { "AUD.PAK", 0, 0, -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("ONETIME.PAK", "3833ff312757b8e6147f464cca0a6587", -1,
+ "AUD.PAK", 0, -1),
Common::DE_DEU,
Common::kPlatformMacintosh,
ADGF_DROPLANGUAGE,
@@ -985,11 +931,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"kyra3",
0,
- {
- { "ONETIME.PAK", 0, "3833ff312757b8e6147f464cca0a6587", -1 },
- { "AUD.PAK", 0, 0, -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("ONETIME.PAK", "3833ff312757b8e6147f464cca0a6587", -1,
+ "AUD.PAK", 0, -1),
Common::FR_FRA,
Common::kPlatformMacintosh,
ADGF_DROPLANGUAGE,
@@ -1003,11 +946,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"kyra3",
0,
- {
- { "ONETIME.PAK", 0, "9aaca21d2a205ca02ec53132f2911794", -1 },
- { "AUD.PAK", 0, 0, -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("ONETIME.PAK", "9aaca21d2a205ca02ec53132f2911794", -1,
+ "AUD.PAK", 0, -1),
Common::ES_ESP,
Common::kPlatformDOS,
ADGF_DROPLANGUAGE,
@@ -1019,11 +959,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"kyra3",
0,
- {
- { "ONETIME.PAK", 0, "9aaca21d2a205ca02ec53132f2911794", -1 },
- { "AUD.PAK", 0, 0, -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("ONETIME.PAK", "9aaca21d2a205ca02ec53132f2911794", -1,
+ "AUD.PAK", 0, -1),
Common::DE_DEU,
Common::kPlatformDOS,
ADGF_DROPLANGUAGE,
@@ -1035,11 +972,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"kyra3",
0,
- {
- { "ONETIME.PAK", 0, "9aaca21d2a205ca02ec53132f2911794", -1 },
- { "AUD.PAK", 0, 0, -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("ONETIME.PAK", "9aaca21d2a205ca02ec53132f2911794", -1,
+ "AUD.PAK", 0, -1),
Common::FR_FRA,
Common::kPlatformDOS,
ADGF_DROPLANGUAGE,
@@ -1053,11 +987,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"kyra3",
0,
- {
- { "ONETIME.PAK", 0, "ee2d4d056a5de5333a3c6bda055b3cb4", -1 },
- { "AUD.PAK", 0, 0, -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("ONETIME.PAK", "ee2d4d056a5de5333a3c6bda055b3cb4", -1,
+ "AUD.PAK", 0, -1),
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_DROPLANGUAGE,
@@ -1069,11 +1000,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"kyra3",
0,
- {
- { "ONETIME.PAK", 0, "ee2d4d056a5de5333a3c6bda055b3cb4", -1 },
- { "AUD.PAK", 0, 0, -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("ONETIME.PAK", "ee2d4d056a5de5333a3c6bda055b3cb4", -1,
+ "AUD.PAK", 0, -1),
Common::DE_DEU,
Common::kPlatformDOS,
ADGF_DROPLANGUAGE,
@@ -1085,11 +1013,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"kyra3",
0,
- {
- { "ONETIME.PAK", 0, "ee2d4d056a5de5333a3c6bda055b3cb4", -1 },
- { "AUD.PAK", 0, 0, -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("ONETIME.PAK", "ee2d4d056a5de5333a3c6bda055b3cb4", -1,
+ "AUD.PAK", 0, -1),
Common::IT_ITA,
Common::kPlatformDOS,
ADGF_DROPLANGUAGE,
@@ -1120,11 +1045,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"lol",
"CD",
- {
- { "GENERAL.PAK", 0, "05a4f588fb81dc9c0ef1f2ec20d89e24", -1 },
- { "L01.PAK", 0, "759a0ac26808d77ea968bd392355ba1d", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("GENERAL.PAK", "05a4f588fb81dc9c0ef1f2ec20d89e24", -1,
+ "L01.PAK", "759a0ac26808d77ea968bd392355ba1d", -1),
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_DROPLANGUAGE | ADGF_CD,
@@ -1137,11 +1059,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"lol",
"CD",
- {
- { "GENERAL.PAK", 0, "05a4f588fb81dc9c0ef1f2ec20d89e24", -1 },
- { "L01.PAK", 0, "759a0ac26808d77ea968bd392355ba1d", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("GENERAL.PAK", "05a4f588fb81dc9c0ef1f2ec20d89e24", -1,
+ "L01.PAK", "759a0ac26808d77ea968bd392355ba1d", -1),
Common::DE_DEU,
Common::kPlatformDOS,
ADGF_DROPLANGUAGE | ADGF_CD,
@@ -1154,11 +1073,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"lol",
"CD",
- {
- { "GENERAL.PAK", 0, "05a4f588fb81dc9c0ef1f2ec20d89e24", -1 },
- { "L01.PAK", 0, "759a0ac26808d77ea968bd392355ba1d", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("GENERAL.PAK", "05a4f588fb81dc9c0ef1f2ec20d89e24", -1,
+ "L01.PAK", "759a0ac26808d77ea968bd392355ba1d", -1),
Common::FR_FRA,
Common::kPlatformDOS,
ADGF_DROPLANGUAGE | ADGF_CD,
@@ -1171,11 +1087,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"lol",
"CD",
- {
- { "GENERAL.PAK", 0, "9e4bab499b7ea9337b91ac29fcba6d13", -1 },
- { "L01.PAK", 0, "759a0ac26808d77ea968bd392355ba1d", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("GENERAL.PAK", "9e4bab499b7ea9337b91ac29fcba6d13", -1,
+ "L01.PAK", "759a0ac26808d77ea968bd392355ba1d", -1),
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_DROPLANGUAGE | ADGF_CD,
@@ -1188,11 +1101,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"lol",
"CD",
- {
- { "GENERAL.PAK", 0, "9e4bab499b7ea9337b91ac29fcba6d13", -1 },
- { "L01.PAK", 0, "759a0ac26808d77ea968bd392355ba1d", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("GENERAL.PAK", "9e4bab499b7ea9337b91ac29fcba6d13", -1,
+ "L01.PAK", "759a0ac26808d77ea968bd392355ba1d", -1),
Common::DE_DEU,
Common::kPlatformDOS,
ADGF_DROPLANGUAGE | ADGF_CD,
@@ -1205,11 +1115,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"lol",
"CD",
- {
- { "GENERAL.PAK", 0, "9e4bab499b7ea9337b91ac29fcba6d13", -1 },
- { "L01.PAK", 0, "759a0ac26808d77ea968bd392355ba1d", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("GENERAL.PAK", "9e4bab499b7ea9337b91ac29fcba6d13", -1,
+ "L01.PAK", "759a0ac26808d77ea968bd392355ba1d", -1),
Common::FR_FRA,
Common::kPlatformDOS,
ADGF_DROPLANGUAGE | ADGF_CD,
@@ -1223,11 +1130,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"lol",
"CD",
- {
- { "GENERAL.PAK", 0, "19354b0f464295c38c801d30588df062", -1 },
- { "L01.PAK", 0, "174d37f21e0336c5d91020f8c58717ef", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("GENERAL.PAK", "19354b0f464295c38c801d30588df062", -1,
+ "L01.PAK", "174d37f21e0336c5d91020f8c58717ef", -1),
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_DROPLANGUAGE | ADGF_CD,
@@ -1241,11 +1145,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"lol",
"CD",
- {
- { "GENERAL.PAK", 0, "19354b0f464295c38c801d30588df062", -1 },
- { "L01.PAK", 0, "d9b9644b709de55f990d5ef73e0f6d44", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("GENERAL.PAK", "19354b0f464295c38c801d30588df062", -1,
+ "L01.PAK", "d9b9644b709de55f990d5ef73e0f6d44", -1),
Common::RU_RUS,
Common::kPlatformDOS,
ADGF_DROPLANGUAGE | ADGF_CD,
@@ -1259,11 +1160,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"lol",
"CD",
- {
- { "GENERAL.PAK", 0, "19354b0f464295c38c801d30588df062", -1 },
- { "L01.PAK", 0, "8aa1860a3e9f84c6f11118a0181bcfaf", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("GENERAL.PAK", "19354b0f464295c38c801d30588df062", -1,
+ "L01.PAK", "8aa1860a3e9f84c6f11118a0181bcfaf", -1),
Common::RU_RUS,
Common::kPlatformDOS,
ADGF_DROPLANGUAGE | ADGF_CD,
@@ -1276,12 +1174,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"lol",
"CD",
- {
-
- { "GENERAL.PAK", 0, "19354b0f464295c38c801d30588df062", -1 },
- { "L01.PAK", 0, "174d37f21e0336c5d91020f8c58717ef", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("GENERAL.PAK", "19354b0f464295c38c801d30588df062", -1,
+ "L01.PAK", "174d37f21e0336c5d91020f8c58717ef", -1),
Common::FR_FRA,
Common::kPlatformDOS,
ADGF_DROPLANGUAGE | ADGF_CD,
@@ -1294,11 +1188,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"lol",
"CD",
- {
- { "GENERAL.PAK", 0, "19354b0f464295c38c801d30588df062", -1 },
- { "L01.PAK", 0, "174d37f21e0336c5d91020f8c58717ef", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("GENERAL.PAK", "19354b0f464295c38c801d30588df062", -1,
+ "L01.PAK", "174d37f21e0336c5d91020f8c58717ef", -1),
Common::RU_RUS,
Common::kPlatformDOS,
ADGF_DROPLANGUAGE | ADGF_CD,
@@ -1312,11 +1203,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"lol",
"CD",
- {
- { "GENERAL.PAK", 0, "05a4f588fb81dc9c0ef1f2ec20d89e24", -1 },
- { "L01.PAK", 0, "898485c0eb7bb4403fdd63bf5191f37e", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("GENERAL.PAK", "05a4f588fb81dc9c0ef1f2ec20d89e24", -1,
+ "L01.PAK", "898485c0eb7bb4403fdd63bf5191f37e", -1),
Common::IT_ITA,
Common::kPlatformDOS,
ADGF_DROPLANGUAGE | ADGF_CD,
@@ -1329,11 +1217,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"lol",
"CD",
- {
- { "GENERAL.PAK", 0, "05a4f588fb81dc9c0ef1f2ec20d89e24", -1 },
- { "L01.PAK", 0, "898485c0eb7bb4403fdd63bf5191f37e", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("GENERAL.PAK", "05a4f588fb81dc9c0ef1f2ec20d89e24", -1,
+ "L01.PAK", "898485c0eb7bb4403fdd63bf5191f37e", -1),
Common::DE_DEU,
Common::kPlatformDOS,
ADGF_DROPLANGUAGE | ADGF_CD,
@@ -1346,11 +1231,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"lol",
"CD",
- {
- { "GENERAL.PAK", 0, "05a4f588fb81dc9c0ef1f2ec20d89e24", -1 },
- { "L01.PAK", 0, "898485c0eb7bb4403fdd63bf5191f37e", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("GENERAL.PAK", "05a4f588fb81dc9c0ef1f2ec20d89e24", -1,
+ "L01.PAK", "898485c0eb7bb4403fdd63bf5191f37e", -1),
Common::FR_FRA,
Common::kPlatformDOS,
ADGF_DROPLANGUAGE | ADGF_CD,
@@ -1363,11 +1245,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"lol",
"CD",
- {
- { "GENERAL.PAK", 0, "9e4bab499b7ea9337b91ac29fcba6d13", -1 },
- { "L01.PAK", 0, "898485c0eb7bb4403fdd63bf5191f37e", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("GENERAL.PAK", "9e4bab499b7ea9337b91ac29fcba6d13", -1,
+ "L01.PAK", "898485c0eb7bb4403fdd63bf5191f37e", -1),
Common::IT_ITA,
Common::kPlatformDOS,
ADGF_DROPLANGUAGE | ADGF_CD,
@@ -1380,11 +1259,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"lol",
"CD",
- {
- { "GENERAL.PAK", 0, "9e4bab499b7ea9337b91ac29fcba6d13", -1 },
- { "L01.PAK", 0, "898485c0eb7bb4403fdd63bf5191f37e", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("GENERAL.PAK", "9e4bab499b7ea9337b91ac29fcba6d13", -1,
+ "L01.PAK", "898485c0eb7bb4403fdd63bf5191f37e", -1),
Common::DE_DEU,
Common::kPlatformDOS,
ADGF_DROPLANGUAGE | ADGF_CD,
@@ -1397,11 +1273,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"lol",
"CD",
- {
- { "GENERAL.PAK", 0, "9e4bab499b7ea9337b91ac29fcba6d13", -1 },
- { "L01.PAK", 0, "898485c0eb7bb4403fdd63bf5191f37e", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("GENERAL.PAK", "9e4bab499b7ea9337b91ac29fcba6d13", -1,
+ "L01.PAK", "898485c0eb7bb4403fdd63bf5191f37e", -1),
Common::FR_FRA,
Common::kPlatformDOS,
ADGF_DROPLANGUAGE | ADGF_CD,
@@ -1414,11 +1287,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"lol",
"CD",
- {
- { "LEVEL01.FRE", 0, "3f5a8856e86b8bc6207becd73426017c", -1 },
- { "LEVEL02.FRE", 0, "03cf8239fd4b4ead22e6b771af84b036", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("LEVEL01.FRE", "3f5a8856e86b8bc6207becd73426017c", -1,
+ "LEVEL02.FRE", "03cf8239fd4b4ead22e6b771af84b036", -1),
Common::ES_ESP,
Common::kPlatformDOS,
ADGF_DROPLANGUAGE | ADGF_CD,
@@ -1431,10 +1301,7 @@ const KYRAGameDescription adGameDescs[] = {
{
"lol",
0,
- {
- { "WESTWOOD.1", 0, "c656aa9a2b4032d341e3dc8e3525b917", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY1s("WESTWOOD.1", "c656aa9a2b4032d341e3dc8e3525b917", -1),
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
@@ -1447,10 +1314,7 @@ const KYRAGameDescription adGameDescs[] = {
{
"lol",
0,
- {
- { "WESTWOOD.1", 0, "320b2828be595c491903f467094f05eb", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY1s("WESTWOOD.1", "320b2828be595c491903f467094f05eb", -1),
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
@@ -1463,10 +1327,7 @@ const KYRAGameDescription adGameDescs[] = {
{
"lol",
0,
- {
- { "WESTWOOD.1", 0, "3c61cb7de5b2ec452f5851f5075207ee", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY1s("WESTWOOD.1", "3c61cb7de5b2ec452f5851f5075207ee", -1),
Common::DE_DEU,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
@@ -1479,10 +1340,7 @@ const KYRAGameDescription adGameDescs[] = {
{
"lol",
0,
- {
- { "WESTWOOD.1", 0, "43857e24d1fc6731f3b13d9ed6db8c3a", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY1s("WESTWOOD.1", "43857e24d1fc6731f3b13d9ed6db8c3a", -1),
Common::FR_FRA,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
@@ -1495,11 +1353,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"lol",
"Extracted",
- {
- { "GENERAL.PAK", 0, "2aaa30e120c08af87196820e9dd4bf73", -1 },
- { "CHAPTER7.PAK", 0, "eb92bf7ebb4e890add1233a6b0c810ff", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("GENERAL.PAK", "2aaa30e120c08af87196820e9dd4bf73", -1,
+ "CHAPTER7.PAK", "eb92bf7ebb4e890add1233a6b0c810ff", -1),
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
@@ -1512,11 +1367,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"lol",
"Extracted",
- {
- { "GENERAL.PAK", 0, "0f1fabc1f67b772a30d8e05ece720ac5", -1 },
- { "CHAPTER7.PAK", 0, "482308aba1c40ee32449b91b0c63b990", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("GENERAL.PAK", "0f1fabc1f67b772a30d8e05ece720ac5", -1,
+ "CHAPTER7.PAK", "482308aba1c40ee32449b91b0c63b990", -1),
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
@@ -1529,11 +1381,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"lol",
"Extracted",
- {
- { "GENERAL.PAK", 0, "d119e3b57f8e5edcbb90980ca6f4215a", -1 },
- { "CHAPTER7.PAK", 0, "71a3d3cb1554294646a389e5c345cf28", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("GENERAL.PAK", "d119e3b57f8e5edcbb90980ca6f4215a", -1,
+ "CHAPTER7.PAK", "71a3d3cb1554294646a389e5c345cf28", -1),
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
@@ -1546,11 +1395,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"lol",
"Extracted",
- {
- { "GENERAL.PAK", 0, "996e66e81054d36249907a1d8158da3d", -1 },
- { "CHAPTER7.PAK", 0, "cabee57f00d6d84b65a732b6868a4959", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("GENERAL.PAK", "996e66e81054d36249907a1d8158da3d", -1,
+ "CHAPTER7.PAK", "cabee57f00d6d84b65a732b6868a4959", -1),
Common::DE_DEU,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
@@ -1563,11 +1409,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"lol",
"Extracted",
- {
- {"GENERAL.PAK", 0, "a9e22c450c4f1de6a600261183430394", -1 },
- {"CHAPTER7.PAK", 0, "fb5294f7445318876741c8db39ba0b1a", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("GENERAL.PAK", "a9e22c450c4f1de6a600261183430394", -1,
+ "CHAPTER7.PAK", "fb5294f7445318876741c8db39ba0b1a", -1),
Common::FR_FRA,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
@@ -1580,11 +1423,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"lol",
"Extracted",
- {
- { "GENERAL.PAK", 0, "f4fd14f244bd7c7fa08d026fafe44cc5", -1 },
- { "CHAPTER7.PAK", 0, "733e33c8444c93843dac3b683c283eaa", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("GENERAL.PAK", "f4fd14f244bd7c7fa08d026fafe44cc5", -1,
+ "CHAPTER7.PAK", "733e33c8444c93843dac3b683c283eaa", -1),
Common::FR_FRA,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
@@ -1597,11 +1437,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"lol",
"Extracted",
- {
- {"GENERAL.PAK", 0, "ca1208aa60c5f3e3a7e06a0420a11526", -1 },
- {"CHAPTER7.PAK", 0, "1f11dc4ba0473eec9d6d93bbf2ee9c8a", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("GENERAL.PAK", "ca1208aa60c5f3e3a7e06a0420a11526", -1,
+ "CHAPTER7.PAK", "1f11dc4ba0473eec9d6d93bbf2ee9c8a", -1),
Common::ES_ESP,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
@@ -1614,11 +1451,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"lol",
"Extracted",
- {
- {"GENERAL.PAK", 0, "f2c305bfb10c08371e947ab4d0a2f5f5", -1 },
- {"CHAPTER7.PAK", 0, "f3cbab6d945ceda35149a5c9a324a8fe", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("GENERAL.PAK", "f2c305bfb10c08371e947ab4d0a2f5f5", -1,
+ "CHAPTER7.PAK", "f3cbab6d945ceda35149a5c9a324a8fe", -1),
Common::ZH_CNA,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
@@ -1631,11 +1465,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"lol",
"Extracted",
- {
- { "GENERAL.PAK", 0, "8e144826df680397876e0fd7ce30c701", -1 },
- { "CHAPTER7.PAK", 0, "1240fb870aba719f5887ca7270227699", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("GENERAL.PAK", "8e144826df680397876e0fd7ce30c701", -1,
+ "CHAPTER7.PAK", "1240fb870aba719f5887ca7270227699", -1),
Common::DE_DEU,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
@@ -1648,11 +1479,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"lol",
"Extracted",
- {
- { "GENERAL.PAK", 0, "8902b233405461025e25093b9c4c8d2c", -1 },
- { "CHAPTER7.PAK", 0, "32a46c338a3d6249c273cc3b3881bb8a", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("GENERAL.PAK", "8902b233405461025e25093b9c4c8d2c", -1,
+ "CHAPTER7.PAK", "32a46c338a3d6249c273cc3b3881bb8a", -1),
Common::JA_JPN,
Common::kPlatformPC98,
ADGF_NO_FLAGS,
@@ -1666,11 +1494,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"lol",
"Extracted",
- {
- { "GENERAL.PAK", 0, "d8f4c1153aed2418f41f886c3fb27543", -1 },
- { "CHAPTER7.PAK", 0, "f0b8a2fdff951738834fadc12248ac1f", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("GENERAL.PAK", "d8f4c1153aed2418f41f886c3fb27543", -1,
+ "CHAPTER7.PAK", "f0b8a2fdff951738834fadc12248ac1f", -1),
Common::RU_RUS,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
@@ -1683,11 +1508,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"lol",
0,
- {
- { "GENERAL.PAK", 0, "3fe6539b9b09084c0984eaf7170464e9", -1 },
- { "MUS.PAK", 0, "008dc69d8cbcdb6bae30e270fab26e76", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("GENERAL.PAK", "3fe6539b9b09084c0984eaf7170464e9", -1,
+ "MUS.PAK", "008dc69d8cbcdb6bae30e270fab26e76", -1),
Common::JA_JPN,
Common::kPlatformPC98,
ADGF_NO_FLAGS,
@@ -1700,11 +1522,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"lol",
0,
- {
- { "GENERAL.PAK", 0, "2e4d4ce54bac9162e11fcba6907b576e", -1 },
- { "TMUS.PAK", 0, "5543dae575164e51856f5a49cfd6b368", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("GENERAL.PAK", "2e4d4ce54bac9162e11fcba6907b576e", -1,
+ "TMUS.PAK", "5543dae575164e51856f5a49cfd6b368", -1),
Common::JA_JPN,
Common::kPlatformFMTowns,
ADGF_NO_FLAGS,
@@ -1717,11 +1536,8 @@ const KYRAGameDescription adGameDescs[] = {
{
"lol",
"Demo",
- {
- { "INTRO.PAK", 0, "4bc22a3b57f19a49212c5de58ab014d6", -1 },
- { "INTROVOC.PAK", 0, "7e578e4f1da31c1f294e14a8e8f3cc44", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY2s("INTRO.PAK", "4bc22a3b57f19a49212c5de58ab014d6", -1,
+ "INTROVOC.PAK", "7e578e4f1da31c1f294e14a8e8f3cc44", -1),
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_DEMO,
@@ -1734,10 +1550,7 @@ const KYRAGameDescription adGameDescs[] = {
{
"lol",
"Demo",
- {
- { "GENERAL.PAK", 0, "e94863d86c4597a2d581d05481c152ba", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY1s("GENERAL.PAK", "e94863d86c4597a2d581d05481c152ba", -1),
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_DEMO,
@@ -1752,10 +1565,7 @@ const KYRAGameDescription adGameDescs[] = {
{
"eob",
0,
- {
- { "EOBDATA3.PAK", 0, "61aff543131bd61a8b7d7dc901a8278b", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY1s("EOBDATA3.PAK", "61aff543131bd61a8b7d7dc901a8278b", -1),
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
@@ -1768,10 +1578,7 @@ const KYRAGameDescription adGameDescs[] = {
{
"eob",
0,
- {
- { "TEXT.DAT", 0, "fb59b50f97fd1806756911d986b9b2b5", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY1s("TEXT.DAT", "fb59b50f97fd1806756911d986b9b2b5", -1),
Common::DE_DEU,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
@@ -1784,10 +1591,7 @@ const KYRAGameDescription adGameDescs[] = {
{
"eob",
0,
- {
- { "EOBDATA3.PAK", 0, "3ed915ab5b94d60dbfe1b55379889c51", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY1s("EOBDATA3.PAK", "3ed915ab5b94d60dbfe1b55379889c51", -1),
Common::IT_ITA,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
@@ -1800,10 +1604,7 @@ const KYRAGameDescription adGameDescs[] = {
{
"eob",
0,
- {
- { "EOBDATA3.PAK", 0, "a7800a8ea8251f678530eb952de7b815", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY1s("EOBDATA3.PAK", "a7800a8ea8251f678530eb952de7b815", -1),
Common::ES_ESP,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
@@ -1816,10 +1617,7 @@ const KYRAGameDescription adGameDescs[] = {
{
"eob",
0,
- {
- { "TEXT.CPS", 0, "e9c2a9d81c8ce2dc35d92ece5950c45d", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY1s("TEXT.CPS", "e9c2a9d81c8ce2dc35d92ece5950c45d", -1),
Common::EN_ANY,
Common::kPlatformAmiga,
ADGF_NO_FLAGS,
@@ -1832,10 +1630,7 @@ const KYRAGameDescription adGameDescs[] = {
{
"eob",
0,
- {
- { "TEXT.CPS", 0, "66253c0f435c5947e6f7166bd94f21e3", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY1s("TEXT.CPS", "66253c0f435c5947e6f7166bd94f21e3", -1),
Common::DE_DEU,
Common::kPlatformAmiga,
ADGF_NO_FLAGS,
@@ -1848,10 +1643,7 @@ const KYRAGameDescription adGameDescs[] = {
{
"eob",
0,
- {
- { "BRICK3.BIN", 0, "7fb13157102accf6ddb806d5ad36c833", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY1s("BRICK3.BIN", "7fb13157102accf6ddb806d5ad36c833", -1),
Common::JA_JPN,
Common::kPlatformPC98,
ADGF_NO_FLAGS,
@@ -1864,10 +1656,7 @@ const KYRAGameDescription adGameDescs[] = {
{
"eob",
0,
- {
- { "PLAYFLD", 0, "e9dbc6944e6c00801f3932808f98e443", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY1s("PLAYFLD", "e9dbc6944e6c00801f3932808f98e443", -1),
Common::EN_ANY,
Common::kPlatformSegaCD,
ADGF_NO_FLAGS,
@@ -1880,10 +1669,7 @@ const KYRAGameDescription adGameDescs[] = {
{
"eob2",
0,
- {
- { "LEVEL15.INF", 0, "10f19eab75c73d0476dc58bcf70fff7a", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY1s("LEVEL15.INF", "10f19eab75c73d0476dc58bcf70fff7a", -1),
Common::EN_ANY,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
@@ -1896,10 +1682,7 @@ const KYRAGameDescription adGameDescs[] = {
{
"eob2",
0,
- {
- { "LEVEL15.INF", 0, "ce54243ad1ca4447f521340428da2c91", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY1s("LEVEL15.INF", "ce54243ad1ca4447f521340428da2c91", -1),
Common::DE_DEU,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
@@ -1912,10 +1695,7 @@ const KYRAGameDescription adGameDescs[] = {
{
"eob2",
0,
- {
- { "LEVEL15.INF", 0, "099c683dc4e66171b19b64ea3e90aa12", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY1s("LEVEL15.INF", "099c683dc4e66171b19b64ea3e90aa12", -1),
Common::ES_ESP,
Common::kPlatformDOS,
ADGF_NO_FLAGS,
@@ -1928,14 +1708,11 @@ const KYRAGameDescription adGameDescs[] = {
{
"eob2",
0,
- {
- { "AZURE.SDT", 0, "2915098f2d1bdcfa518f857a26bb3324", -1 },
- { 0, 0, 0, 0 }
- },
- Common::JA_JPN,
- Common::kPlatformFMTowns,
- ADGF_NO_FLAGS,
- GUIO5(GUIO_NOSPEECH, GUIO_MIDITOWNS, GUIO_RENDERFMTOWNS, GAMEOPTION_EOB_HPGRAPHS, GAMEOPTION_EOB_MOUSESWAP)
+ AD_ENTRY1s("AZURE.SDT", "2915098f2d1bdcfa518f857a26bb3324", -1),
+ Common::JA_JPN,
+ Common::kPlatformFMTowns,
+ ADGF_NO_FLAGS,
+ GUIO5(GUIO_NOSPEECH, GUIO_MIDITOWNS, GUIO_RENDERFMTOWNS, GAMEOPTION_EOB_HPGRAPHS, GAMEOPTION_EOB_MOUSESWAP)
},
EOB2_FMTOWNS_FLAGS
},
@@ -1944,10 +1721,7 @@ const KYRAGameDescription adGameDescs[] = {
{
"eob2",
0,
- {
- { "TEXT.CPS", 0, "e7350914bd7ca68039a4bc6aa42c43d4", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY1s("TEXT.CPS", "e7350914bd7ca68039a4bc6aa42c43d4", -1),
Common::EN_ANY,
Common::kPlatformAmiga,
ADGF_NO_FLAGS,
@@ -1960,10 +1734,7 @@ const KYRAGameDescription adGameDescs[] = {
{
"eob2",
0,
- {
- { "TEXT.CPS", 0, "562adb7c1780481205b4d86ce1a54f20", -1 },
- { 0, 0, 0, 0 }
- },
+ AD_ENTRY1s("TEXT.CPS", "562adb7c1780481205b4d86ce1a54f20", -1),
Common::DE_DEU,
Common::kPlatformAmiga,
ADGF_NO_FLAGS,
Commit: a2d62b46b51dbab9f3d59eb300992951db1e3dd6
https://github.com/scummvm/scummvm/commit/a2d62b46b51dbab9f3d59eb300992951db1e3dd6
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-11-28T15:24:01+01:00
Commit Message:
KYRA: Fix OOB access in the detection table
Changed paths:
engines/kyra/detection_tables.h
diff --git a/engines/kyra/detection_tables.h b/engines/kyra/detection_tables.h
index dc338ee4b4..6a2f7e3457 100644
--- a/engines/kyra/detection_tables.h
+++ b/engines/kyra/detection_tables.h
@@ -1029,7 +1029,8 @@ const KYRAGameDescription adGameDescs[] = {
{
{ "ONETIME.PAK", 0, "3833ff312757b8e6147f464cca0a6587", -1 },
{ "ALBUM.TRG", 0, "5e40de0c74cc2321928a15019252d468", -1 },
- { "AUD.PAK", 0, 0, -1 }
+ { "AUD.PAK", 0, 0, -1 },
+ AD_LISTEND
},
Common::RU_RUS,
Common::kPlatformDOS,
More information about the Scummvm-git-logs
mailing list