[Scummvm-cvs-logs] SF.net SVN: scummvm: [24882] scummvm/trunk
sev at users.sourceforge.net
sev at users.sourceforge.net
Tue Dec 19 05:35:14 CET 2006
Revision: 24882
http://scummvm.svn.sourceforge.net/scummvm/?rev=24882&view=rev
Author: sev
Date: 2006-12-18 20:35:08 -0800 (Mon, 18 Dec 2006)
Log Message:
-----------
Get rif od ARRAYSIZE in ADGameDescription
Modified Paths:
--------------
scummvm/trunk/common/advancedDetector.cpp
scummvm/trunk/common/advancedDetector.h
scummvm/trunk/engines/agi/detection.cpp
scummvm/trunk/engines/agos/agos.h
scummvm/trunk/engines/agos/agosgame.cpp
scummvm/trunk/engines/cine/detection.cpp
scummvm/trunk/engines/kyra/plugin.cpp
scummvm/trunk/engines/saga/rscfile.cpp
scummvm/trunk/engines/saga/sagagame.cpp
Modified: scummvm/trunk/common/advancedDetector.cpp
===================================================================
--- scummvm/trunk/common/advancedDetector.cpp 2006-12-19 03:52:04 UTC (rev 24881)
+++ scummvm/trunk/common/advancedDetector.cpp 2006-12-19 04:35:08 UTC (rev 24882)
@@ -217,8 +217,6 @@
}
ADList AdvancedDetector::detectGame(const FSList *fslist, Language language, Platform platform) {
- int filesCount;
-
typedef HashMap<String, bool, CaseSensitiveString_Hash, CaseSensitiveString_EqualTo> StringSet;
StringSet filesList;
@@ -243,7 +241,7 @@
// First we compose list of files which we need MD5s for
for (i = 0; i < _gameDescriptions.size(); i++) {
- for (j = 0; j < _gameDescriptions[i]->filesCount; j++) {
+ for (j = 0; _gameDescriptions[i]->filesDescriptions[j].fileName; j++) {
tstr = String(_gameDescriptions[i]->filesDescriptions[j].fileName);
tstr.toLowercase();
tstr2 = tstr + ".";
@@ -293,11 +291,10 @@
}
for (i = 0; i < _gameDescriptions.size(); i++) {
- filesCount = _gameDescriptions[i]->filesCount;
fileMissing = false;
// Try to open all files for this game
- for (j = 0; j < filesCount; j++) {
+ for (j = 0; _gameDescriptions[i]->filesDescriptions[j].fileName; j++) {
fileDesc = &_gameDescriptions[i]->filesDescriptions[j];
tstr = fileDesc->fileName;
tstr.toLowercase();
@@ -336,7 +333,10 @@
// Search max number
int maxcount = 0;
for (i = 0; i < matchedCount; i++) {
- maxcount = MAX(_gameDescriptions[matched[i]]->filesCount, maxcount);
+ int fCount = 0;
+ for (j = 0; _gameDescriptions[i]->filesDescriptions[j].fileName; j++)
+ fCount++;
+ maxcount = MAX(fCount, maxcount);
}
// Now purge targets with number of files lesser than max
@@ -348,7 +348,11 @@
continue;
}
- if (_gameDescriptions[matched[i]]->filesCount < maxcount) {
+ int fCount = 0;
+ for (j = 0; _gameDescriptions[matched[i]]->filesDescriptions[j].fileName; j++)
+ fCount++;
+
+ if (fCount < maxcount) {
debug(2, "Purged: %s", getDescription(matched[i]).c_str());
matched[i] = -1;
}
Modified: scummvm/trunk/common/advancedDetector.h
===================================================================
--- scummvm/trunk/common/advancedDetector.h 2006-12-19 03:52:04 UTC (rev 24881)
+++ scummvm/trunk/common/advancedDetector.h 2006-12-19 04:35:08 UTC (rev 24882)
@@ -39,7 +39,6 @@
struct ADGameDescription {
const char *name;
const char *extra;
- int filesCount;
const ADGameFileDescription *filesDescriptions;
Language language;
Platform platform;
Modified: scummvm/trunk/engines/agi/detection.cpp
===================================================================
--- scummvm/trunk/engines/agi/detection.cpp 2006-12-19 03:52:04 UTC (rev 24881)
+++ scummvm/trunk/engines/agi/detection.cpp 2006-12-19 04:35:08 UTC (rev 24882)
@@ -61,23 +61,29 @@
// Kings Quest I entries
static const ADGameFileDescription AGI_KQ1_PC_20F_GameFiles[] = {
{ "logdir", 0, "10ad66e2ecbd66951534a50aedcd0128"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription AGI_KQ1_2GS_10S_GameFiles[] = {
{ "logdir", 0, "f4277aa34b43d37382bc424c81627617"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription AGI_KQ1_MAC_20C_GameFiles[] = {
{ "logdir", 0, "d4c4739d4ac63f7dbd29255425077d48"},
+ { NULL, 0, NULL}
};
// Kings Quest II Entries
static const ADGameFileDescription AGI_KQ2_PC_22_GameFiles[] = {
{ "logdir", 0, "b944c4ff18fb8867362dc21cc688a283"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription AGI_KQ2_AMIGA_20F_GameFiles[] = {
{ "logdir", 0, "b866f0fab2fad91433a637a828cfa410"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription AGI_KQ2_MAC_20R_GameFiles[] = {
{ "logdir", 0, "cbdb0083317c8e7cfb7ac35da4bc7fdc"},
+ { NULL, 0, NULL}
};
@@ -87,7 +93,6 @@
{
"agi",
"King's Quest 1 (PC 5.25\"/3.5\") 2.0F [AGI 2.917]",
- ARRAYSIZE(AGI_KQ1_PC_20F_GameFiles),
AGI_KQ1_PC_20F_GameFiles,
Common::EN_ANY,
Common::kPlatformPC,
@@ -102,7 +107,6 @@
{
"agi",
"King's Quest 1 (IIgs) 1.0S-88223",
- ARRAYSIZE(AGI_KQ1_2GS_10S_GameFiles),
AGI_KQ1_2GS_10S_GameFiles,
Common::EN_ANY,
Common::kPlatformApple2GS,
@@ -118,7 +122,6 @@
{
"agi",
"King's Quest 1 (Mac) 2.0C",
- ARRAYSIZE(AGI_KQ1_MAC_20C_GameFiles),
AGI_KQ1_MAC_20C_GameFiles,
Common::EN_ANY,
Common::kPlatformMacintosh,
@@ -134,7 +137,6 @@
{
"agi",
"King's Quest 2 (PC 5.25\"/3.5\") 2.2 [AGI 2.426]",
- ARRAYSIZE(AGI_KQ2_PC_22_GameFiles),
AGI_KQ2_PC_22_GameFiles,
Common::EN_ANY,
Common::kPlatformPC,
@@ -149,7 +151,6 @@
{
"agi",
"King's Quest 2 (Amiga) 2.0J",
- ARRAYSIZE(AGI_KQ2_AMIGA_20F_GameFiles),
AGI_KQ2_AMIGA_20F_GameFiles,
Common::EN_ANY,
Common::kPlatformAmiga,
@@ -164,7 +165,6 @@
{
"agi",
"King's Quest 2 (Mac) 2.0R",
- ARRAYSIZE(AGI_KQ2_MAC_20R_GameFiles),
AGI_KQ2_MAC_20R_GameFiles,
Common::EN_ANY,
Common::kPlatformMacintosh,
@@ -174,7 +174,7 @@
0x2440,
},
- { { NULL, NULL, 0, NULL, Common::UNK_LANG, Common::kPlatformUnknown }, 0, 0, 0 }
+ { { NULL, NULL, NULL, Common::UNK_LANG, Common::kPlatformUnknown }, 0, 0, 0 }
};
bool AgiEngine::initGame() {
Modified: scummvm/trunk/engines/agos/agos.h
===================================================================
--- scummvm/trunk/engines/agos/agos.h 2006-12-19 03:52:04 UTC (rev 24881)
+++ scummvm/trunk/engines/agos/agos.h 2006-12-19 04:35:08 UTC (rev 24882)
@@ -181,7 +181,7 @@
Common::Language getLanguage() const { return _gameDescription->desc.language; }
Common::Platform getPlatform() const { return _gameDescription->desc.platform; }
const char *getFileName(int type) const {
- for (int i = 0; i < _gameDescription->desc.filesCount; i++) {
+ for (int i = 0; _gameDescription->desc.filesDescriptions[i].fileType; i++) {
if (_gameDescription->desc.filesDescriptions[i].fileType == type)
return _gameDescription->desc.filesDescriptions[i].fileName;
}
Modified: scummvm/trunk/engines/agos/agosgame.cpp
===================================================================
--- scummvm/trunk/engines/agos/agosgame.cpp 2006-12-19 03:52:04 UTC (rev 24881)
+++ scummvm/trunk/engines/agos/agosgame.cpp 2006-12-19 04:35:08 UTC (rev 24882)
@@ -1,36 +1,42 @@
static const ADGameFileDescription ELVIRA1AMIGA_GameFiles[] = {
{ "gameamiga", GAME_BASEFILE, "7bdaff4a118d8035047cf9b1393b3fa0"},
{ "icon.dat", GAME_ICONFILE, "2db931e84f1ca01f0816dddfae3f49e1"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription ELVIRA1AMIGADEMO_GameFiles[] = {
{ "agos.mdf", GAME_MENUFILE, "825bc8eecd599f4c26732902ba2c2c77"},
{ "englishdemo", GAME_BASEFILE, "7bbc2dfe8619ef579004ff57674c6e92"},
{ "icon.dat", GAME_ICONFILE, "68b329da9893e34099c7d8ad5cb9c940"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription ELVIRA1ST_GameFiles[] = {
{ "gamest", GAME_BASEFILE, "8942859018fcfb2dbed13e83d974d1ab"},
{ "icon.dat", GAME_ICONFILE, "2db931e84f1ca01f0816dddfae3f49e1"},
{ "tbllist", GAME_TBLFILE, "5b6ff494bf7e24213758598ef4ac0a8b"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription ELVIRA1DOS_EN_GameFiles[] = {
{ "gamepc", GAME_BASEFILE, "a49e132a1f18306dd5d1ec2fe435e178"},
{ "icon.dat", GAME_ICONFILE, "fda48c9da7f3e72d0313e2f5f760fc45"},
{ "tbllist", GAME_TBLFILE, "319f6b227c7822a551f57d24e70f8149"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription ELVIRA1DOS_DE_GameFiles[] = {
{ "gamepc", GAME_BASEFILE, "d0b593143e21fc150c044819df2c0b98"},
{ "icon.dat", GAME_ICONFILE, "fda48c9da7f3e72d0313e2f5f760fc45"},
{ "tbllist", GAME_TBLFILE, "319f6b227c7822a551f57d24e70f8149"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription ELVIRA1DOS_FR_GameFiles[] = {
{ "gamepc", GAME_BASEFILE, "9076d507d60cc454df662316438ec843"},
{ "icon.dat", GAME_ICONFILE, "fda48c9da7f3e72d0313e2f5f760fc45"},
{ "tbllist", GAME_TBLFILE, "319f6b227c7822a551f57d24e70f8149"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription ELVIRA2AMIGA_GameFiles[] = {
@@ -39,6 +45,7 @@
{ "menus.dat", GAME_MENUFILE, "a2fdc88a77c8bdffec6b36cbeda4d955"},
{ "stripped.txt", GAME_STRFILE, "41c975a9c1106cb5298a0bc3df0a266e"},
{ "tbllist", GAME_TBLFILE, "177f5f2640e80ef92d1421d32de06a5e"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription ELVIRA2ST_GameFiles[] = {
@@ -47,6 +54,7 @@
{ "menus.dat", GAME_MENUFILE, "a2fdc88a77c8bdffec6b36cbeda4d955"},
{ "stripped.txt", GAME_STRFILE, "41c975a9c1106cb5298a0bc3df0a266e"},
{ "tbllist", GAME_TBLFILE, "177f5f2640e80ef92d1421d32de06a5e"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription ELVIRA2DOS_EN_GameFiles[] = {
@@ -55,6 +63,7 @@
{ "menus.dat", GAME_MENUFILE, "a2fdc88a77c8bdffec6b36cbeda4d955"},
{ "stripped.txt", GAME_STRFILE, "c2533277b7ff11f5495967d55355ea17"},
{ "tbllist", GAME_TBLFILE, "8252660df0edbdbc3e6377e155bbd0c5"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription ELVIRA2DOS_EN_ALT_GameFiles[] = {
@@ -63,6 +72,7 @@
{ "menus.dat", GAME_MENUFILE, "a2fdc88a77c8bdffec6b36cbeda4d955"},
{ "stripped.txt", GAME_STRFILE, "c2533277b7ff11f5495967d55355ea17"},
{ "tbllist", GAME_TBLFILE, "8252660df0edbdbc3e6377e155bbd0c5"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription ELVIRA2DOS_DE_GameFiles[] = {
@@ -71,6 +81,7 @@
{ "menus.dat", GAME_MENUFILE, "a2fdc88a77c8bdffec6b36cbeda4d955"},
{ "stripped.txt", GAME_STRFILE, "c3a8f644551a27c8a2fec0f8070b46b7"},
{ "tbllist", GAME_TBLFILE, "8252660df0edbdbc3e6377e155bbd0c5"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription ELVIRA2DOS_FR_GameFiles[] = {
@@ -79,6 +90,7 @@
{ "menus.dat", GAME_MENUFILE, "a2fdc88a77c8bdffec6b36cbeda4d955"},
{ "stripped.txt", GAME_STRFILE, "c3a8f644551a27c8a2fec0f8070b46b7"},
{ "tbllist", GAME_TBLFILE, "8252660df0edbdbc3e6377e155bbd0c5"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription WAXWORKSAMIGA_GameFiles[] = {
@@ -88,6 +100,7 @@
{ "stripped.txt", GAME_STRFILE, "6faaebff2786216900061eeb978f10af"},
{ "tbllist", GAME_TBLFILE, "95c44bfc380770a6b6dd0dfcc69e80a0"},
{ "xtbllist", GAME_XTBLFILE, "6c7b3db345d46349a5226f695c03e20f"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription WAXWORKSDOS_GameFiles[] = {
@@ -98,6 +111,7 @@
{ "stripped.txt", GAME_STRFILE, "f259e3e07a1cde8d0404a767d815e12c"},
{ "tbllist", GAME_TBLFILE, "95c44bfc380770a6b6dd0dfcc69e80a0"},
{ "xtbllist", GAME_XTBLFILE, "6c7b3db345d46349a5226f695c03e20f"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON1ACORNDEMO_GameFiles[] = {
@@ -106,6 +120,7 @@
{ "icondata", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19"},
{ "stripped", GAME_STRFILE, "d9de7542612d9f4e0819ad0df5eac56b"},
{ "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON1ACORN_GameFiles[] = {
@@ -114,6 +129,7 @@
{ "icondata", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19"},
{ "stripped", GAME_STRFILE, "f3b27a3fbb45dcd323a48159496e45e8"},
{ "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON1AMIGA_ECS_GameFiles[] = {
@@ -121,6 +137,7 @@
{ "icon.pkd", GAME_ICONFILE, "565ef7a98dcc21ef526a2bb10b6f42ed"},
{ "stripped.txt", GAME_STRFILE, "f5fc67db3b8c5283cda51c43b98a74f8"},
{ "tbllist", GAME_TBLFILE, "f9d5bf2ce09f82289c791c3ca26e1e4b"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON1AMIGA_ECS_DEMO_GameFiles[] = {
@@ -128,6 +145,7 @@
{ "icon.pkd", GAME_ICONFILE, "ebc96af15bfaf75ba8210326b9260d2f"},
{ "stripped.txt", GAME_STRFILE, "8edde5b9498dc9f31da1093028da467c"},
{ "tbllist", GAME_TBLFILE, "1247e024e1f13ca54c1e354120c7519c"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON1AMIGA_AGA_EN_GameFiles[] = {
@@ -135,6 +153,7 @@
{ "icon.pkd", GAME_ICONFILE, "565ef7a98dcc21ef526a2bb10b6f42ed"},
{ "stripped.txt", GAME_STRFILE, "c649fcc0439766810e5097ee7e81d4c8"},
{ "tbllist", GAME_TBLFILE, "f9d5bf2ce09f82289c791c3ca26e1e4b"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON1AMIGA_AGA_FR_GameFiles[] = {
@@ -142,6 +161,7 @@
{ "icon.pkd", GAME_ICONFILE, "565ef7a98dcc21ef526a2bb10b6f42ed"},
{ "stripped.txt", GAME_STRFILE, "2297baec985617d0d5612a0124bac359"},
{ "tbllist", GAME_TBLFILE, "f9d5bf2ce09f82289c791c3ca26e1e4b"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON1AMIGA_AGA_DE_GameFiles[] = {
@@ -149,6 +169,7 @@
{ "icon.pkd", GAME_ICONFILE, "565ef7a98dcc21ef526a2bb10b6f42ed"},
{ "stripped.txt", GAME_STRFILE, "c649fcc0439766810e5097ee7e81d4c8"},
{ "tbllist", GAME_TBLFILE, "f9d5bf2ce09f82289c791c3ca26e1e4b"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON1CD32_GameFiles[] = {
@@ -156,6 +177,7 @@
{ "icon.pkd", GAME_ICONFILE, "565ef7a98dcc21ef526a2bb10b6f42ed"},
{ "stripped.txt", GAME_STRFILE, "59be788020441e21861e284236fd08c1"},
{ "tbllist", GAME_TBLFILE, "f9d5bf2ce09f82289c791c3ca26e1e4b"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON1CD32_ALT_GameFiles[] = {
@@ -163,6 +185,7 @@
{ "icon.pkd", GAME_ICONFILE, "8ce5a46466a4f8f6d0f780b0ef00d5f5"},
{ "stripped.txt", GAME_STRFILE, "59be788020441e21861e284236fd08c1"},
{ "tbllist", GAME_TBLFILE, "f9d5bf2ce09f82289c791c3ca26e1e4b"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON1DOS_INF_GameFiles[] = {
@@ -170,6 +193,7 @@
{ "icon.dat", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19"},
{ "stripped.txt", GAME_STRFILE, "2af9affc5981eec44b90d4c556145cb8"},
{ "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON1DOS_INF_RU_GameFiles[] = {
@@ -177,6 +201,7 @@
{ "icon.dat", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19"},
{ "stripped.txt", GAME_STRFILE, "2af9affc5981eec44b90d4c556145cb8"},
{ "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON1DOS_EN_GameFiles[] = {
@@ -184,6 +209,7 @@
{ "icon.dat", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19"},
{ "stripped.txt", GAME_STRFILE, "c95a0a1ee973e19c2a1c5d12026c139f"},
{ "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON1DOS_RU_GameFiles[] = {
@@ -191,6 +217,7 @@
{ "icon.dat", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19"},
{ "stripped.txt", GAME_STRFILE, "c95a0a1ee973e19c2a1c5d12026c139f"},
{ "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON1DOS_FR_GameFiles[] = {
@@ -198,6 +225,7 @@
{ "icon.dat", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19"},
{ "stripped.txt", GAME_STRFILE, "aa01e7386057abc0c3e27dbaa9c4ba5b"},
{ "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON1DOS_DE_GameFiles[] = {
@@ -205,6 +233,7 @@
{ "icon.dat", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19"},
{ "stripped.txt", GAME_STRFILE, "c95a0a1ee973e19c2a1c5d12026c139f"},
{ "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON1DOS_IT_GameFiles[] = {
@@ -212,6 +241,7 @@
{ "icon.dat", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19"},
{ "stripped.txt", GAME_STRFILE, "2af9affc5981eec44b90d4c556145cb8"},
{ "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON1DOS_ES_GameFiles[] = {
@@ -219,6 +249,7 @@
{ "icon.dat", GAME_ICONFILE, "22107c24dfb31b66ac503c28a6e20b19"},
{ "stripped.txt", GAME_STRFILE, "2af9affc5981eec44b90d4c556145cb8"},
{ "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON1DEMO_GameFiles[] = {
@@ -226,6 +257,7 @@
{ "icon.dat", GAME_ICONFILE, "55af3b4d93972bc58bfee38a86b76c3f"},
{ "stripped.txt", GAME_STRFILE, "33a2e329b97b2a349858d6a093159eb7"},
{ "tbllist", GAME_TBLFILE, "1247e024e1f13ca54c1e354120c7519c"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON1TALKIE_EN_GameFiles[] = {
@@ -234,6 +266,7 @@
{ "simon.gme", GAME_GMEFILE, "64958b3a38afdcb85da1eeed85169806"},
{ "stripped.txt", GAME_STRFILE, "f3b27a3fbb45dcd323a48159496e45e8"},
{ "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON1TALKIE_EN_ALT_GameFiles[] = {
@@ -242,6 +275,7 @@
{ "simon.gme", GAME_GMEFILE, "64f73e94639b63af846ac4a8a94a23d8"},
{ "stripped.txt", GAME_STRFILE, "f3b27a3fbb45dcd323a48159496e45e8"},
{ "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON1TALKIE_FR_GameFiles[] = {
@@ -250,6 +284,7 @@
{ "simon.gme", GAME_GMEFILE, "638049fa5d41b81fb6fb11671721b871"},
{ "stripped.txt", GAME_STRFILE, "ef51ac74c946881ae4d7ca66cc7a0d1e"},
{ "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON1TALKIE_DE_GameFiles[] = {
@@ -258,6 +293,7 @@
{ "simon.gme", GAME_GMEFILE, "7db9912acac4f1d965a64bdcfc370ba1"},
{ "stripped.txt", GAME_STRFILE, "40d68bec54042ef930f084ad9a4342a1"},
{ "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON1TALKIE_HB_GameFiles[] = {
@@ -266,6 +302,7 @@
{ "simon.gme", GAME_GMEFILE, "a34b2c8642f2e3676d7088b5c8b3e884"},
{ "stripped.txt", GAME_STRFILE, "9d31bef42db1a8abe4e9f368014df1d5"},
{ "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON1TALKIE_IT_GameFiles[] = {
@@ -274,6 +311,7 @@
{ "simon.gme", GAME_GMEFILE, "52e315e0e02feca86d15cc82e3306b6c"},
{ "stripped.txt", GAME_STRFILE, "9d31bef42db1a8abe4e9f368014df1d5"},
{ "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON1TALKIE_IT_ALT_GameFiles[] = {
@@ -282,6 +320,7 @@
{ "simon.gme", GAME_GMEFILE, "104efd83c8f3edf545982e07d87f66ac"},
{ "stripped.txt", GAME_STRFILE, "9d31bef42db1a8abe4e9f368014df1d5"},
{ "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON1TALKIE_ES_GameFiles[] = {
@@ -290,6 +329,7 @@
{ "simon.gme", GAME_GMEFILE, "eff2774a73890b9eac533db90cd1afa1"},
{ "stripped.txt", GAME_STRFILE, "9d31bef42db1a8abe4e9f368014df1d5"},
{ "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON1WIN_EN_GameFiles[] = {
@@ -298,6 +338,7 @@
{ "simon.gme", GAME_GMEFILE, "b1b18d0731b64c0738c5cc4a2ee792fc"},
{ "stripped.txt", GAME_STRFILE, "a27e87a9ba21212d769804b3df47bfb2"},
{ "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON1WIN_RU_GameFiles[] = {
@@ -306,6 +347,7 @@
{ "simon.gme", GAME_GMEFILE, "b1b18d0731b64c0738c5cc4a2ee792fc"},
{ "stripped.txt", GAME_STRFILE, "a27e87a9ba21212d769804b3df47bfb2"},
{ "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON1WIN_DE_GameFiles[] = {
@@ -314,6 +356,7 @@
{ "simon.gme", GAME_GMEFILE, "acd9cc438525b142d93b15c77a6f551b"},
{ "stripped.txt", GAME_STRFILE, "40d68bec54042ef930f084ad9a4342a1"},
{ "tbllist", GAME_TBLFILE, "d198a80de2c59e4a0cd24b98814849e8"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON2DOS_EN_GameFiles[] = {
@@ -322,6 +365,7 @@
{ "simon2.gme", GAME_GMEFILE, "eefcc32b1f2c0482c1a59a963a146345"},
{ "stripped.txt", GAME_STRFILE, "e229f84d46fa83f99b4a7115679f3fb6"},
{ "tbllist", GAME_TBLFILE, "2082f8d02075e590300478853a91ffd9"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON2DOS_RU_GameFiles[] = {
@@ -330,6 +374,7 @@
{ "simon2.gme", GAME_GMEFILE, "eefcc32b1f2c0482c1a59a963a146345"},
{ "stripped.txt", GAME_STRFILE, "e229f84d46fa83f99b4a7115679f3fb6"},
{ "tbllist", GAME_TBLFILE, "2082f8d02075e590300478853a91ffd9"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON2DOS_EN_ALT_GameFiles[] = {
@@ -338,6 +383,7 @@
{ "simon2.gme", GAME_GMEFILE, "aa6840420899a31874204f90bb214108"},
{ "stripped.txt", GAME_STRFILE, "e229f84d46fa83f99b4a7115679f3fb6"},
{ "tbllist", GAME_TBLFILE, "2082f8d02075e590300478853a91ffd9"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON2DOS2_RU_GameFiles[] = {
@@ -346,6 +392,7 @@
{ "simon2.gme", GAME_GMEFILE, "aa6840420899a31874204f90bb214108"},
{ "stripped.txt", GAME_STRFILE, "e229f84d46fa83f99b4a7115679f3fb6"},
{ "tbllist", GAME_TBLFILE, "2082f8d02075e590300478853a91ffd9"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON2DOS_DE_GameFiles[] = {
@@ -354,6 +401,7 @@
{ "simon2.gme", GAME_GMEFILE, "5fa9d080b04c610f526bd685be1bf747"},
{ "stripped.txt", GAME_STRFILE, "fd30df01cc248ecbaef302af855e0212"},
{ "tbllist", GAME_TBLFILE, "2082f8d02075e590300478853a91ffd9"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON2DOS_IT_GameFiles[] = {
@@ -362,6 +410,7 @@
{ "simon2.gme", GAME_GMEFILE, "f306a397565d7f13bec7ecf14c723de7"},
{ "stripped.txt", GAME_STRFILE, "bea6843fb9f3b2144fcb146d62db0b9a"},
{ "tbllist", GAME_TBLFILE, "2082f8d02075e590300478853a91ffd9"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON2DEMO_EN_GameFiles[] = {
@@ -370,6 +419,7 @@
{ "simon2.gme", GAME_GMEFILE, "f8c9e6df1e55923a749e115ba74210c4"},
{ "stripped.txt", GAME_STRFILE, "e229f84d46fa83f99b4a7115679f3fb6"},
{ "tbllist", GAME_TBLFILE, "a0d5a494b5d3d209d1a1d76cc8d76601"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON2DEMO_DE_GameFiles[] = {
@@ -378,6 +428,7 @@
{ "simon2.gme", GAME_GMEFILE, "3f308f201f6b1ddf7c2704c1fc43a3e1"},
{ "stripped.txt", GAME_STRFILE, "4c68cf64e581a9bd638a56c900b08bfe"},
{ "tbllist", GAME_TBLFILE, "a0d5a494b5d3d209d1a1d76cc8d76601"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON2TALKIE_EN_GameFiles[] = {
@@ -386,6 +437,7 @@
{ "simon2.gme", GAME_GMEFILE, "9c535d403966750ae98bdaf698375a38"},
{ "stripped.txt", GAME_STRFILE, "e229f84d46fa83f99b4a7115679f3fb6"},
{ "tbllist", GAME_TBLFILE, "2082f8d02075e590300478853a91ffd9"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON2TALKIE_EN_ALT_GameFiles[] = {
@@ -394,6 +446,7 @@
{ "simon2.gme", GAME_GMEFILE, "8d6dcc65577e285dbca03ff6d7d9323c"},
{ "stripped.txt", GAME_STRFILE, "e229f84d46fa83f99b4a7115679f3fb6"},
{ "tbllist", GAME_TBLFILE, "a0d5a494b5d3d209d1a1d76cc8d76601"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON2TALKIE_FR_GameFiles[] = {
@@ -402,6 +455,7 @@
{ "simon2.gme", GAME_GMEFILE, "8af0e02c0c3344db64dffc12196eb59d"},
{ "stripped.txt", GAME_STRFILE, "5ea27977b4d7dcfd50eb5074e162ebbf"},
{ "tbllist", GAME_TBLFILE, "2082f8d02075e590300478853a91ffd9"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON2TALKIE_DE_GameFiles[] = {
@@ -410,6 +464,7 @@
{ "simon2.gme", GAME_GMEFILE, "6c5fdfdd0eab9038767c2d22858406b2"},
{ "stripped.txt", GAME_STRFILE, "6de6292c9ac11bfb2e70fdb0f773ba85"},
{ "tbllist", GAME_TBLFILE, "2082f8d02075e590300478853a91ffd9"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON2TALKIE_DE_ALT_GameFiles[] = {
@@ -418,6 +473,7 @@
{ "simon2.gme", GAME_GMEFILE, "ec9f0f24fd895e7ea72e3c8e448c0240"},
{ "stripped.txt", GAME_STRFILE, "6de6292c9ac11bfb2e70fdb0f773ba85"},
{ "tbllist", GAME_TBLFILE, "2082f8d02075e590300478853a91ffd9"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON2TALKIE_HB_GameFiles[] = {
@@ -426,6 +482,7 @@
{ "simon2.gme", GAME_GMEFILE, "a2b249a82ea182af09789eb95fb6c5be"},
{ "stripped.txt", GAME_STRFILE, "de9dbc24158660e153483fa0cf6c3172"},
{ "tbllist", GAME_TBLFILE, "2082f8d02075e590300478853a91ffd9"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON2TALKIE_IT_GameFiles[] = {
@@ -434,6 +491,7 @@
{ "simon2.gme", GAME_GMEFILE, "344aca58e5ad5e25c517d5eb1d85c435"},
{ "stripped.txt", GAME_STRFILE, "bea6843fb9f3b2144fcb146d62db0b9a"},
{ "tbllist", GAME_TBLFILE, "2082f8d02075e590300478853a91ffd9"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON2TALKIE_ES_GameFiles[] = {
@@ -442,6 +500,7 @@
{ "simon2.gme", GAME_GMEFILE, "4f43bd06b6cc78dbd25a7475ca964eb1"},
{ "stripped.txt", GAME_STRFILE, "d13753796bd81bf313a2449f34d8b112"},
{ "tbllist", GAME_TBLFILE, "2082f8d02075e590300478853a91ffd9"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON2WIN_CZ_GameFiles[] = {
@@ -450,6 +509,7 @@
{ "simon2.gme", GAME_GMEFILE, "2d1074788501c55dcd9e59269ea0aaed"},
{ "stripped.txt", GAME_STRFILE, "e229f84d46fa83f99b4a7115679f3fb6"},
{ "tbllist", GAME_TBLFILE, "2082f8d02075e590300478853a91ffd9"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON2WIN_EN_GameFiles[] = {
@@ -458,6 +518,7 @@
{ "simon2.gme", GAME_GMEFILE, "e749c4c103d7e7d51b34620ed76c5a04"},
{ "stripped.txt", GAME_STRFILE, "e229f84d46fa83f99b4a7115679f3fb6"},
{ "tbllist", GAME_TBLFILE, "2082f8d02075e590300478853a91ffd9"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON2WIN_DE_GameFiles[] = {
@@ -466,6 +527,7 @@
{ "simon2.gme", GAME_GMEFILE, "9609a933c541fed2e00c6c3479d7c181"},
{ "stripped.txt", GAME_STRFILE, "6de6292c9ac11bfb2e70fdb0f773ba85"},
{ "tbllist", GAME_TBLFILE, "2082f8d02075e590300478853a91ffd9"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON2WIN_DE_ALT_GameFiles[] = {
@@ -474,6 +536,7 @@
{ "simon2.gme", GAME_GMEFILE, "16d574da07e93bcae43cee353dab8c7e"},
{ "stripped.txt", GAME_STRFILE, "6de6292c9ac11bfb2e70fdb0f773ba85"},
{ "tbllist", GAME_TBLFILE, "2082f8d02075e590300478853a91ffd9"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SIMON2WIN_PL_GameFiles[] = {
@@ -482,88 +545,105 @@
{ "simon2.gme", GAME_GMEFILE, "7b9afcf82a94722707e0d025c0192be8"},
{ "stripped.txt", GAME_STRFILE, "e229f84d46fa83f99b4a7115679f3fb6"},
{ "tbllist", GAME_TBLFILE, "2082f8d02075e590300478853a91ffd9"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription FEEBLEFILES_AMI_DE_GameFiles[] = {
{ "game22", GAME_BASEFILE, "bcd76ac080003eee3649df18db25b60e"},
{ "gfxindex.dat", GAME_GFXIDXFILE,"f550f7915c5ce3a68c9f870f507449c2"},
{ "tbllist", GAME_TBLFILE, "0bbfee8e69739111eb36b0d138da8ddf"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription FEEBLEFILES_AMI_UK_GameFiles[] = {
{ "game22", GAME_BASEFILE, "629762ea9ca9ee9ff85f4774d219f5c7"},
{ "gfxindex.dat", GAME_GFXIDXFILE,"f550f7915c5ce3a68c9f870f507449c2"},
{ "tbllist", GAME_TBLFILE, "0bbfee8e69739111eb36b0d138da8ddf"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription FEEBLEFILES_MAC_DE_GameFiles[] = {
{ "game22", GAME_BASEFILE, "bcd76ac080003eee3649df18db25b60e"},
{ "graphics.vga", GAME_GFXIDXFILE,"11a4853cb35956846976e9473ee0e41e"},
{ "tbllist", GAME_TBLFILE, "0bbfee8e69739111eb36b0d138da8ddf"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription FEEBLEFILES_MAC_FR_GameFiles[] = {
{ "game22", GAME_BASEFILE, "ba90b40a47726039671d9e91630dd7ed"},
{ "graphics.vga", GAME_GFXIDXFILE,"11a4853cb35956846976e9473ee0e41e"},
{ "tbllist", GAME_TBLFILE, "0bbfee8e69739111eb36b0d138da8ddf"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription FEEBLEFILES_MAC_ES_GameFiles[] = {
{ "game22", GAME_BASEFILE, "71d7d2d5e479b053c5a9757f1702c9c3"},
{ "graphics.vga", GAME_GFXIDXFILE,"11a4853cb35956846976e9473ee0e41e"},
{ "tbllist", GAME_TBLFILE, "0bbfee8e69739111eb36b0d138da8ddf"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription FEEBLEFILES_MAC_UK_GameFiles[] = {
{ "game22", GAME_BASEFILE, "629762ea9ca9ee9ff85f4774d219f5c7"},
{ "graphics.vga", GAME_GFXIDXFILE,"11a4853cb35956846976e9473ee0e41e"},
{ "tbllist", GAME_TBLFILE, "0bbfee8e69739111eb36b0d138da8ddf"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription FEEBLEFILES_EN_2CD_GameFiles[] = {
{ "game22", GAME_BASEFILE, "629762ea9ca9ee9ff85f4774d219f5c7"},
{ "tbllist", GAME_TBLFILE, "0bbfee8e69739111eb36b0d138da8ddf"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription FEEBLEFILES_EN_4CD_GameFiles[] = {
{ "game22", GAME_BASEFILE, "a8746407a5b20a7da0da0a14c380af1c"},
{ "tbllist", GAME_TBLFILE, "0bbfee8e69739111eb36b0d138da8ddf"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription FEEBLEFILES_DE_GameFiles[] = {
{ "game22", GAME_BASEFILE, "bcd76ac080003eee3649df18db25b60e"},
{ "tbllist", GAME_TBLFILE, "0bbfee8e69739111eb36b0d138da8ddf"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription FEEBLEFILES_FR_GameFiles[] = {
{ "game22", GAME_BASEFILE, "ba90b40a47726039671d9e91630dd7ed"},
{ "tbllist", GAME_TBLFILE, "0bbfee8e69739111eb36b0d138da8ddf"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription FEEBLEFILES_IT_GameFiles[] = {
{ "game22", GAME_BASEFILE, "80576f2e1ed4c912b63921fe77af313e"},
{ "tbllist", GAME_TBLFILE, "0bbfee8e69739111eb36b0d138da8ddf"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription FEEBLEFILES_ES_GameFiles[] = {
{ "game22", GAME_BASEFILE, "71d7d2d5e479b053c5a9757f1702c9c3"},
{ "tbllist", GAME_TBLFILE, "0bbfee8e69739111eb36b0d138da8ddf"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription DIMP_GameFiles[] = {
{ "Gdimp", GAME_BASEFILE, "0b1e89ae1dc2e012b7fa7a987b4ac42a"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription JUMBLE_GameFiles[] = {
{ "Gjumble", GAME_BASEFILE, "d54cce46d339038d1a6b74ea213655bc"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription PUZZLE_GameFiles[] = {
{ "Gpuzzle", GAME_BASEFILE, "3f80dac8e0d85401a1058a560fe49ab6"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription SWAMPY_GameFiles[] = {
{ "Gswampy", GAME_BASEFILE, "3a6d4d7b2433e660f2483f9396cc87a2"},
+ { NULL, 0, NULL}
};
#define FILE_MD5_BYTES 5000
@@ -574,7 +654,6 @@
{
"elvira1",
"Floppy",
- ARRAYSIZE(ELVIRA1AMIGA_GameFiles),
ELVIRA1AMIGA_GameFiles,
Common::EN_ANY,
Common::kPlatformAmiga,
@@ -590,7 +669,6 @@
{
"elvira1",
"Demo",
- ARRAYSIZE(ELVIRA1AMIGADEMO_GameFiles),
ELVIRA1AMIGADEMO_GameFiles,
Common::EN_ANY,
Common::kPlatformAmiga,
@@ -606,7 +684,6 @@
{
"elvira1",
"Floppy",
- ARRAYSIZE(ELVIRA1ST_GameFiles),
ELVIRA1ST_GameFiles,
Common::EN_ANY,
Common::kPlatformAtariST,
@@ -622,7 +699,6 @@
{
"elvira1",
"Floppy",
- ARRAYSIZE(ELVIRA1DOS_EN_GameFiles),
ELVIRA1DOS_EN_GameFiles,
Common::EN_ANY,
Common::kPlatformPC,
@@ -638,7 +714,6 @@
{
"elvira1",
"Floppy",
- ARRAYSIZE(ELVIRA1DOS_DE_GameFiles),
ELVIRA1DOS_DE_GameFiles,
Common::DE_DEU,
Common::kPlatformPC,
@@ -654,7 +729,6 @@
{
"elvira1",
"Floppy",
- ARRAYSIZE(ELVIRA1DOS_FR_GameFiles),
ELVIRA1DOS_FR_GameFiles,
Common::FR_FRA,
Common::kPlatformPC,
@@ -670,7 +744,6 @@
{
"elvira2",
"Floppy",
- ARRAYSIZE(ELVIRA2AMIGA_GameFiles),
ELVIRA2AMIGA_GameFiles,
Common::EN_ANY,
Common::kPlatformAmiga,
@@ -686,7 +759,6 @@
{
"elvira2",
"Floppy",
- ARRAYSIZE(ELVIRA2ST_GameFiles),
ELVIRA2ST_GameFiles,
Common::EN_ANY,
Common::kPlatformAtariST,
@@ -702,7 +774,6 @@
{
"elvira2",
"Floppy",
- ARRAYSIZE(ELVIRA2DOS_EN_GameFiles),
ELVIRA2DOS_EN_GameFiles,
Common::EN_ANY,
Common::kPlatformPC,
@@ -718,7 +789,6 @@
{
"elvira2",
"Floppy",
- ARRAYSIZE(ELVIRA2DOS_EN_ALT_GameFiles),
ELVIRA2DOS_EN_ALT_GameFiles,
Common::EN_ANY,
Common::kPlatformPC,
@@ -734,7 +804,6 @@
{
"elvira2",
"Floppy",
- ARRAYSIZE(ELVIRA2DOS_DE_GameFiles),
ELVIRA2DOS_DE_GameFiles,
Common::DE_DEU,
Common::kPlatformPC,
@@ -750,7 +819,6 @@
{
"elvira2",
"Floppy",
- ARRAYSIZE(ELVIRA2DOS_FR_GameFiles),
ELVIRA2DOS_FR_GameFiles,
Common::FR_FRA,
Common::kPlatformPC,
@@ -766,7 +834,6 @@
{
"waxworks",
"Floppy",
- ARRAYSIZE(WAXWORKSAMIGA_GameFiles),
WAXWORKSAMIGA_GameFiles,
Common::EN_ANY,
Common::kPlatformAmiga,
@@ -782,7 +849,6 @@
{
"waxworks",
"Floppy",
- ARRAYSIZE(WAXWORKSDOS_GameFiles),
WAXWORKSDOS_GameFiles,
Common::EN_ANY,
Common::kPlatformPC,
@@ -798,7 +864,6 @@
{
"simon1",
"CD Demo",
- ARRAYSIZE(SIMON1ACORNDEMO_GameFiles),
SIMON1ACORNDEMO_GameFiles,
Common::EN_ANY,
Common::kPlatformAcorn,
@@ -814,7 +879,6 @@
{
"simon1",
"CD",
- ARRAYSIZE(SIMON1ACORN_GameFiles),
SIMON1ACORN_GameFiles,
Common::EN_ANY,
Common::kPlatformAcorn,
@@ -830,7 +894,6 @@
{
"simon1",
"ECS Floppy",
- ARRAYSIZE(SIMON1AMIGA_ECS_GameFiles),
SIMON1AMIGA_ECS_GameFiles,
Common::EN_ANY,
Common::kPlatformAmiga,
@@ -846,7 +909,6 @@
{
"simon1",
"ECS Demo",
- ARRAYSIZE(SIMON1AMIGA_ECS_DEMO_GameFiles),
SIMON1AMIGA_ECS_DEMO_GameFiles,
Common::EN_ANY,
Common::kPlatformAmiga,
@@ -862,7 +924,6 @@
{
"simon1",
"AGA Floppy",
- ARRAYSIZE(SIMON1AMIGA_AGA_EN_GameFiles),
SIMON1AMIGA_AGA_EN_GameFiles,
Common::EN_ANY,
Common::kPlatformAmiga,
@@ -878,7 +939,6 @@
{
"simon1",
"AGA Floppy",
- ARRAYSIZE(SIMON1AMIGA_AGA_FR_GameFiles),
SIMON1AMIGA_AGA_FR_GameFiles,
Common::FR_FRA,
Common::kPlatformAmiga,
@@ -894,7 +954,6 @@
{
"simon1",
"AGA Floppy",
- ARRAYSIZE(SIMON1AMIGA_AGA_DE_GameFiles),
SIMON1AMIGA_AGA_DE_GameFiles,
Common::DE_DEU,
Common::kPlatformAmiga,
@@ -910,7 +969,6 @@
{
"simon1",
"CD32",
- ARRAYSIZE(SIMON1CD32_GameFiles),
SIMON1CD32_GameFiles,
Common::EN_ANY,
Common::kPlatformAmiga,
@@ -926,7 +984,6 @@
{
"simon1",
"CD32",
- ARRAYSIZE(SIMON1CD32_ALT_GameFiles),
SIMON1CD32_ALT_GameFiles,
Common::EN_ANY,
Common::kPlatformAmiga,
@@ -942,7 +999,6 @@
{
"simon1",
"Floppy Demo",
- ARRAYSIZE(SIMON1DEMO_GameFiles),
SIMON1DEMO_GameFiles,
Common::EN_ANY,
Common::kPlatformPC,
@@ -958,7 +1014,6 @@
{
"simon1",
"Floppy",
- ARRAYSIZE(SIMON1DOS_EN_GameFiles),
SIMON1DOS_EN_GameFiles,
Common::EN_ANY,
Common::kPlatformPC,
@@ -974,7 +1029,6 @@
{
"simon1",
"Floppy",
- ARRAYSIZE(SIMON1DOS_RU_GameFiles),
SIMON1DOS_RU_GameFiles,
Common::RU_RUS,
Common::kPlatformPC,
@@ -990,7 +1044,6 @@
{
"simon1",
"Floppy",
- ARRAYSIZE(SIMON1DOS_INF_GameFiles),
SIMON1DOS_INF_GameFiles,
Common::EN_ANY,
Common::kPlatformPC,
@@ -1006,7 +1059,6 @@
{
"simon1",
"Floppy",
- ARRAYSIZE(SIMON1DOS_INF_RU_GameFiles),
SIMON1DOS_INF_RU_GameFiles,
Common::RU_RUS,
Common::kPlatformPC,
@@ -1022,7 +1074,6 @@
{
"simon1",
"Floppy",
- ARRAYSIZE(SIMON1DOS_FR_GameFiles),
SIMON1DOS_FR_GameFiles,
Common::FR_FRA,
Common::kPlatformPC,
@@ -1038,7 +1089,6 @@
{
"simon1",
"Floppy",
- ARRAYSIZE(SIMON1DOS_DE_GameFiles),
SIMON1DOS_DE_GameFiles,
Common::DE_DEU,
Common::kPlatformPC,
@@ -1054,7 +1104,6 @@
{
"simon1",
"Floppy",
- ARRAYSIZE(SIMON1DOS_IT_GameFiles),
SIMON1DOS_IT_GameFiles,
Common::IT_ITA,
Common::kPlatformPC,
@@ -1070,7 +1119,6 @@
{
"simon1",
"Floppy",
- ARRAYSIZE(SIMON1DOS_ES_GameFiles),
SIMON1DOS_ES_GameFiles,
Common::ES_ESP,
Common::kPlatformPC,
@@ -1086,7 +1134,6 @@
{
"simon1",
"CD",
- ARRAYSIZE(SIMON1TALKIE_EN_GameFiles),
SIMON1TALKIE_EN_GameFiles,
Common::EN_ANY,
Common::kPlatformPC,
@@ -1102,7 +1149,6 @@
{
"simon1",
"CD",
- ARRAYSIZE(SIMON1TALKIE_EN_ALT_GameFiles),
SIMON1TALKIE_EN_ALT_GameFiles,
Common::EN_ANY,
Common::kPlatformPC,
@@ -1118,7 +1164,6 @@
{
"simon1",
"CD",
- ARRAYSIZE(SIMON1TALKIE_FR_GameFiles),
SIMON1TALKIE_FR_GameFiles,
Common::FR_FRA,
Common::kPlatformPC,
@@ -1134,7 +1179,6 @@
{
"simon1",
"CD",
- ARRAYSIZE(SIMON1TALKIE_DE_GameFiles),
SIMON1TALKIE_DE_GameFiles,
Common::DE_DEU,
Common::kPlatformPC,
@@ -1150,7 +1194,6 @@
{
"simon1",
"CD",
- ARRAYSIZE(SIMON1TALKIE_HB_GameFiles),
SIMON1TALKIE_HB_GameFiles,
Common::HB_ISR,
Common::kPlatformPC,
@@ -1166,7 +1209,6 @@
{
"simon1",
"CD",
- ARRAYSIZE(SIMON1TALKIE_IT_GameFiles),
SIMON1TALKIE_IT_GameFiles,
Common::IT_ITA,
Common::kPlatformPC,
@@ -1182,7 +1224,6 @@
{
"simon1",
"CD",
- ARRAYSIZE(SIMON1TALKIE_IT_ALT_GameFiles),
SIMON1TALKIE_IT_ALT_GameFiles,
// FIXME: DOS version which uses WAV format
Common::IT_ITA,
@@ -1199,7 +1240,6 @@
{
"simon1",
"CD",
- ARRAYSIZE(SIMON1TALKIE_ES_GameFiles),
SIMON1TALKIE_ES_GameFiles,
Common::ES_ESP,
Common::kPlatformPC,
@@ -1215,7 +1255,6 @@
{
"simon1",
"CD",
- ARRAYSIZE(SIMON1WIN_EN_GameFiles),
SIMON1WIN_EN_GameFiles,
Common::EN_ANY,
Common::kPlatformWindows,
@@ -1231,7 +1270,6 @@
{
"simon1",
"CD",
- ARRAYSIZE(SIMON1WIN_RU_GameFiles),
SIMON1WIN_RU_GameFiles,
Common::RU_RUS,
Common::kPlatformWindows,
@@ -1247,7 +1285,6 @@
{
"simon1",
"CD",
- ARRAYSIZE(SIMON1WIN_DE_GameFiles),
SIMON1WIN_DE_GameFiles,
Common::DE_DEU,
Common::kPlatformWindows,
@@ -1263,7 +1300,6 @@
{
"simon2",
"Floppy",
- ARRAYSIZE(SIMON2DOS_EN_GameFiles),
SIMON2DOS_EN_GameFiles,
Common::EN_ANY,
Common::kPlatformPC,
@@ -1279,7 +1315,6 @@
{
"simon2",
"Floppy",
- ARRAYSIZE(SIMON2DOS_RU_GameFiles),
SIMON2DOS_RU_GameFiles,
Common::RU_RUS,
Common::kPlatformPC,
@@ -1295,7 +1330,6 @@
{
"simon2",
"Floppy",
- ARRAYSIZE(SIMON2DOS_EN_ALT_GameFiles),
SIMON2DOS_EN_ALT_GameFiles,
Common::EN_ANY,
Common::kPlatformPC,
@@ -1311,7 +1345,6 @@
{
"simon2",
"Floppy",
- ARRAYSIZE(SIMON2DOS2_RU_GameFiles),
SIMON2DOS2_RU_GameFiles,
Common::RU_RUS,
Common::kPlatformPC,
@@ -1327,7 +1360,6 @@
{
"simon2",
"Floppy",
- ARRAYSIZE(SIMON2DOS_DE_GameFiles),
SIMON2DOS_DE_GameFiles,
Common::DE_DEU,
Common::kPlatformPC,
@@ -1343,7 +1375,6 @@
{
"simon2",
"Floppy",
- ARRAYSIZE(SIMON2DOS_IT_GameFiles),
SIMON2DOS_IT_GameFiles,
Common::IT_ITA,
Common::kPlatformPC,
@@ -1359,7 +1390,6 @@
{
"simon2",
"CD Demo",
- ARRAYSIZE(SIMON2DEMO_EN_GameFiles),
SIMON2DEMO_EN_GameFiles,
Common::EN_ANY,
Common::kPlatformPC,
@@ -1375,7 +1405,6 @@
{
"simon2",
"CD Demo",
- ARRAYSIZE(SIMON2DEMO_DE_GameFiles),
SIMON2DEMO_DE_GameFiles,
Common::DE_DEU,
Common::kPlatformPC,
@@ -1391,7 +1420,6 @@
{
"simon2",
"CD",
- ARRAYSIZE(SIMON2TALKIE_EN_GameFiles),
SIMON2TALKIE_EN_GameFiles,
Common::EN_ANY,
Common::kPlatformPC,
@@ -1407,7 +1435,6 @@
{
"simon2",
"CD",
- ARRAYSIZE(SIMON2TALKIE_EN_ALT_GameFiles),
SIMON2TALKIE_EN_ALT_GameFiles,
Common::EN_ANY,
Common::kPlatformPC,
@@ -1423,7 +1450,6 @@
{
"simon2",
"CD",
- ARRAYSIZE(SIMON2TALKIE_FR_GameFiles),
SIMON2TALKIE_FR_GameFiles,
Common::FR_FRA,
Common::kPlatformPC,
@@ -1439,7 +1465,6 @@
{
"simon2",
"CD",
- ARRAYSIZE(SIMON2TALKIE_DE_GameFiles),
SIMON2TALKIE_DE_GameFiles,
Common::DE_DEU,
Common::kPlatformPC,
@@ -1455,7 +1480,6 @@
{
"simon2",
"CD",
- ARRAYSIZE(SIMON2TALKIE_DE_ALT_GameFiles),
SIMON2TALKIE_DE_ALT_GameFiles,
Common::DE_DEU,
Common::kPlatformPC,
@@ -1471,7 +1495,6 @@
{
"simon2",
"CD",
- ARRAYSIZE(SIMON2TALKIE_HB_GameFiles),
SIMON2TALKIE_HB_GameFiles,
Common::HB_ISR,
Common::kPlatformPC,
@@ -1487,7 +1510,6 @@
{
"simon2",
"CD",
- ARRAYSIZE(SIMON2TALKIE_IT_GameFiles),
SIMON2TALKIE_IT_GameFiles,
// FIXME: DOS version which uses WAV format
Common::IT_ITA,
@@ -1504,7 +1526,6 @@
{
"simon2",
"CD",
- ARRAYSIZE(SIMON2TALKIE_ES_GameFiles),
SIMON2TALKIE_ES_GameFiles,
Common::ES_ESP,
Common::kPlatformPC,
@@ -1520,7 +1541,6 @@
{
"simon2",
"CD",
- ARRAYSIZE(SIMON2WIN_CZ_GameFiles),
SIMON2WIN_CZ_GameFiles,
Common::CZ_CZE,
Common::kPlatformWindows,
@@ -1536,7 +1556,6 @@
{
"simon2",
"CD",
- ARRAYSIZE(SIMON2WIN_EN_GameFiles),
SIMON2WIN_EN_GameFiles,
Common::EN_ANY,
Common::kPlatformWindows,
@@ -1552,7 +1571,6 @@
{
"simon2",
"CD",
- ARRAYSIZE(SIMON2WIN_DE_GameFiles),
SIMON2WIN_DE_GameFiles,
Common::DE_DEU,
Common::kPlatformWindows,
@@ -1568,7 +1586,6 @@
{
"simon2",
"CD",
- ARRAYSIZE(SIMON2WIN_DE_ALT_GameFiles),
SIMON2WIN_DE_ALT_GameFiles,
Common::DE_DEU,
Common::kPlatformWindows,
@@ -1584,7 +1601,6 @@
{
"simon2",
"CD",
- ARRAYSIZE(SIMON2WIN_PL_GameFiles),
SIMON2WIN_PL_GameFiles,
Common::PL_POL,
Common::kPlatformWindows,
@@ -1600,7 +1616,6 @@
{
"feeble",
"CD",
- ARRAYSIZE(FEEBLEFILES_AMI_UK_GameFiles),
FEEBLEFILES_AMI_UK_GameFiles,
Common::EN_ANY,
Common::kPlatformAmiga,
@@ -1616,7 +1631,6 @@
{
"feeble",
"CD",
- ARRAYSIZE(FEEBLEFILES_AMI_DE_GameFiles),
FEEBLEFILES_AMI_DE_GameFiles,
Common::DE_DEU,
Common::kPlatformAmiga,
@@ -1632,7 +1646,6 @@
{
"feeble",
"CD",
- ARRAYSIZE(FEEBLEFILES_MAC_UK_GameFiles),
FEEBLEFILES_MAC_UK_GameFiles,
Common::EN_ANY,
Common::kPlatformMacintosh,
@@ -1648,7 +1661,6 @@
{
"feeble",
"CD",
- ARRAYSIZE(FEEBLEFILES_MAC_FR_GameFiles),
FEEBLEFILES_MAC_FR_GameFiles,
Common::FR_FRA,
Common::kPlatformMacintosh,
@@ -1664,7 +1676,6 @@
{
"feeble",
"CD",
- ARRAYSIZE(FEEBLEFILES_MAC_DE_GameFiles),
FEEBLEFILES_MAC_DE_GameFiles,
Common::DE_DEU,
Common::kPlatformMacintosh,
@@ -1680,7 +1691,6 @@
{
"feeble",
"CD",
- ARRAYSIZE(FEEBLEFILES_MAC_ES_GameFiles),
FEEBLEFILES_MAC_ES_GameFiles,
Common::ES_ESP,
Common::kPlatformMacintosh,
@@ -1696,7 +1706,6 @@
{
"feeble",
"2CD",
- ARRAYSIZE(FEEBLEFILES_EN_2CD_GameFiles),
FEEBLEFILES_EN_2CD_GameFiles,
Common::EN_ANY,
Common::kPlatformWindows,
@@ -1712,7 +1721,6 @@
{
"feeble",
"4CD",
- ARRAYSIZE(FEEBLEFILES_EN_4CD_GameFiles),
FEEBLEFILES_EN_4CD_GameFiles,
Common::EN_ANY,
Common::kPlatformWindows,
@@ -1728,7 +1736,6 @@
{
"feeble",
"4CD",
- ARRAYSIZE(FEEBLEFILES_FR_GameFiles),
FEEBLEFILES_FR_GameFiles,
Common::FR_FRA,
Common::kPlatformWindows,
@@ -1744,7 +1751,6 @@
{
"feeble",
"4CD",
- ARRAYSIZE(FEEBLEFILES_DE_GameFiles),
FEEBLEFILES_DE_GameFiles,
Common::DE_DEU,
Common::kPlatformWindows,
@@ -1760,7 +1766,6 @@
{
"feeble",
"4CD",
- ARRAYSIZE(FEEBLEFILES_IT_GameFiles),
FEEBLEFILES_IT_GameFiles,
Common::IT_ITA,
Common::kPlatformWindows,
@@ -1776,7 +1781,6 @@
{
"feeble",
"4CD",
- ARRAYSIZE(FEEBLEFILES_ES_GameFiles),
FEEBLEFILES_ES_GameFiles,
Common::ES_ESP,
Common::kPlatformWindows,
@@ -1792,7 +1796,6 @@
{
"dimp",
"CD",
- ARRAYSIZE(DIMP_GameFiles),
DIMP_GameFiles,
Common::EN_ANY,
Common::kPlatformWindows,
@@ -1808,7 +1811,6 @@
{
"jumble",
"CD",
- ARRAYSIZE(JUMBLE_GameFiles),
JUMBLE_GameFiles,
Common::EN_ANY,
Common::kPlatformWindows,
@@ -1824,7 +1826,6 @@
{
"puzzle",
"CD",
- ARRAYSIZE(PUZZLE_GameFiles),
PUZZLE_GameFiles,
Common::EN_ANY,
Common::kPlatformWindows,
@@ -1840,7 +1841,6 @@
{
"swampy",
"CD",
- ARRAYSIZE(SWAMPY_GameFiles),
SWAMPY_GameFiles,
Common::EN_ANY,
Common::kPlatformWindows,
@@ -1850,5 +1850,5 @@
GID_SWAMPY,
GF_OLD_BUNDLE | GF_TALKIE,
},
- { { NULL, NULL, 0, NULL, Common::UNK_LANG, Common::kPlatformUnknown }, 0, 0, 0 }
+ { { NULL, NULL, NULL, Common::UNK_LANG, Common::kPlatformUnknown }, 0, 0, 0 }
};
Modified: scummvm/trunk/engines/cine/detection.cpp
===================================================================
--- scummvm/trunk/engines/cine/detection.cpp 2006-12-19 03:52:04 UTC (rev 24881)
+++ scummvm/trunk/engines/cine/detection.cpp 2006-12-19 04:35:08 UTC (rev 24882)
@@ -56,124 +56,154 @@
static const ADGameFileDescription FW_GameFiles[] = {
{ "part01", 0, "61d003202d301c29dd399acfb1354310"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription FWALT_GameFiles[] = {
{ "part01", 0, "91d7271155520eae6915a9dd2dac120c"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription FWDE_GameFiles[] = {
{ "part01", 0, "f5e98fcca3fb5e7afa284c81c39d8b14"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription FWES_GameFiles[] = {
{ "part01", 0, "570109f965c7f53984b98c83d86eb206"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription FWFR_GameFiles[] = {
{ "part01", 0, "5d1acb97abe9591f9008e00d07add95a"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription FWAmiga_GameFiles[] = {
{ "part01", 0, "57afd280b598b4180fda6689fbedc4b8"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription FWAmigaDE_GameFiles[] = {
{ "part01", 0, "3a87a913e0e33963a48a7f822ca0eb0e"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription FWAmigaES_GameFiles[] = {
{ "part01", 0, "5ad0007ccd5f7b3dd6b15ea7f281f9e1"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription FWAmigaFR_GameFiles[] = {
{ "part01", 0, "460f2da8793bc581a2d4b6fc19ccb5ae"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription FWAmigaIT_GameFiles[] = {
{ "part01", 0, "1c8e5207743172134409ac58860021af"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription FWAmigaDemo_GameFiles[] = {
{ "demo", 0, "0f50767cd964e302d3af0ba2528df8c4"},
{ "demo.prc", 0, "d2ac3a743d288359c63644ea7071edae"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription FWST_GameFiles[] = {
{ "part01", 0, "36050db13af57e462ca1adc4df99de4e"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription FWSTFR_GameFiles[] = {
{ "part01", 0, "ef245573b7dab0d4825ceb98e37cef4d"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription OS_GameFiles[] = {
{ "procs00", 0, "d6752e7d25924cb866b61eb7cb0c8b56"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription OSUS_GameFiles[] = {
{ "procs1", 0, "d8c3a9d05a63e4cfa801826a7063a126"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription OSUS256_GameFiles[] = {
{ "procs00", 0, "862a75d76fb7fffec30e52be9ad1c474"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription OSDE_GameFiles[] = {
{ "procs1", 0, "39b91ae35d1297ce0a76a1a803ca1593"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription OSES_GameFiles[] = {
{ "procs1", 0, "74c2dabd9d212525fca8875a5f6d8994"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription OSESCD_GameFiles[] = {
{ "procs1", 0, "74c2dabd9d212525fca8875a5f6d8994"},
{ "sds1", 0, "75443ba39cdc95667e07d7118e5c151c"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription OSFR_GameFiles[] = {
{ "procs00", 0, "f143567f08cfd1a9b1c9a41c89eadfef"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription OSIT_GameFiles[] = {
{ "procs1", 0, "da066e6b8dd93f2502c2a3755f08dc12"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription OSAmiga_GameFiles[] = {
{ "procs0", 0, "a9da5531ead0ebf9ad387fa588c0cbb0"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription OSAmigaAlt_GameFiles[] = {
{ "procs0", 0, "8a429ced2f4acff8a15ae125174042e8"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription OSAmigaUS_GameFiles[] = {
{ "procs0", 0, "d5f27e33fc29c879f36f15b86ccfa58c"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription OSAmigaDE_GameFiles[] = {
{ "procs0", 0, "8b7dce249821d3a62b314399c4334347"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription OSAmigaES_GameFiles[] = {
{ "procs0", 0, "35fc295ddd0af9da932d256ba799a4b0"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription OSAmigaFR_GameFiles[] = {
{ "procs0", 0, "d4ea4a97e01fa67ea066f9e785050ed2"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription OSAmigaDemo_GameFiles[] = {
{ "demo", 0, "8d3a750d1c840b1b1071e42f9e6f6aa2"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription OSST_GameFiles[] = {
{ "procs0", 0, "1501d5ae364b2814a33ed19347c3fcae"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription OSSTFR_GameFiles[] = {
{ "procs0", 0, "2148d25de3219dd4a36580ca735d0afa"},
+ { NULL, 0, NULL}
};
@@ -182,7 +212,6 @@
{
"fw",
"",
- ARRAYSIZE(FW_GameFiles),
FW_GameFiles,
Common::EN_ANY,
Common::kPlatformPC,
@@ -196,7 +225,6 @@
{
"fw",
"",
- ARRAYSIZE(FWALT_GameFiles),
FWALT_GameFiles,
Common::EN_ANY,
Common::kPlatformPC,
@@ -209,7 +237,6 @@
{
"fw",
"",
- ARRAYSIZE(FWDE_GameFiles),
FWDE_GameFiles,
Common::DE_DEU,
Common::kPlatformPC,
@@ -222,7 +249,6 @@
{
"fw",
"",
- ARRAYSIZE(FWES_GameFiles),
FWES_GameFiles,
Common::ES_ESP,
Common::kPlatformPC,
@@ -235,7 +261,6 @@
{
"fw",
"",
- ARRAYSIZE(FWFR_GameFiles),
FWFR_GameFiles,
Common::FR_FRA,
Common::kPlatformPC,
@@ -248,7 +273,6 @@
{
"fw",
"",
- ARRAYSIZE(FWAmiga_GameFiles),
FWAmiga_GameFiles,
Common::EN_ANY,
Common::kPlatformAmiga,
@@ -261,7 +285,6 @@
{
"fw",
"",
- ARRAYSIZE(FWAmigaDE_GameFiles),
FWAmigaDE_GameFiles,
Common::DE_DEU,
Common::kPlatformAmiga,
@@ -274,7 +297,6 @@
{
"fw",
"",
- ARRAYSIZE(FWAmigaES_GameFiles),
FWAmigaES_GameFiles,
Common::ES_ESP,
Common::kPlatformAmiga,
@@ -287,7 +309,6 @@
{
"fw",
"",
- ARRAYSIZE(FWAmigaFR_GameFiles),
FWAmigaFR_GameFiles,
Common::FR_FRA,
Common::kPlatformAmiga,
@@ -300,7 +321,6 @@
{
"fw",
"",
- ARRAYSIZE(FWAmigaIT_GameFiles),
FWAmigaIT_GameFiles,
Common::IT_ITA,
Common::kPlatformAmiga,
@@ -313,7 +333,7 @@
{
"fw",
"Demo",
- ARRAYSIZE(FWAmigaDemo_GameFiles),
+
FWAmigaDemo_GameFiles,
Common::EN_ANY,
Common::kPlatformAmiga,
@@ -326,7 +346,6 @@
{
"fw",
"",
- ARRAYSIZE(FWST_GameFiles),
FWST_GameFiles,
Common::EN_ANY,
Common::kPlatformAtariST,
@@ -339,7 +358,6 @@
{
"fw",
"",
- ARRAYSIZE(FWSTFR_GameFiles),
FWSTFR_GameFiles,
Common::FR_FRA,
Common::kPlatformAtariST,
@@ -352,7 +370,6 @@
{
"os",
"256 colors",
- ARRAYSIZE(OS_GameFiles),
OS_GameFiles,
Common::EN_GRB,
Common::kPlatformPC,
@@ -365,7 +382,6 @@
{
"os",
"",
- ARRAYSIZE(OSUS_GameFiles),
OSUS_GameFiles,
Common::EN_USA,
Common::kPlatformPC,
@@ -378,7 +394,6 @@
{
"os",
"256 colors",
- ARRAYSIZE(OSUS256_GameFiles),
OSUS256_GameFiles,
Common::EN_USA,
Common::kPlatformPC,
@@ -391,7 +406,6 @@
{
"os",
"",
- ARRAYSIZE(OSDE_GameFiles),
OSDE_GameFiles,
Common::DE_DEU,
Common::kPlatformPC,
@@ -404,7 +418,6 @@
{
"os",
"",
- ARRAYSIZE(OSES_GameFiles),
OSES_GameFiles,
Common::ES_ESP,
Common::kPlatformPC,
@@ -417,7 +430,6 @@
{
"os",
"256 colors",
- ARRAYSIZE(OSESCD_GameFiles),
OSESCD_GameFiles,
Common::ES_ESP,
Common::kPlatformPC,
@@ -430,7 +442,6 @@
{
"os",
"256 colors",
- ARRAYSIZE(OSFR_GameFiles),
OSFR_GameFiles,
Common::FR_FRA,
Common::kPlatformPC,
@@ -443,7 +454,6 @@
{
"os",
"",
- ARRAYSIZE(OSIT_GameFiles),
OSIT_GameFiles,
Common::IT_ITA,
Common::kPlatformPC,
@@ -456,7 +466,6 @@
{
"os",
"",
- ARRAYSIZE(OSAmiga_GameFiles),
OSAmiga_GameFiles,
Common::EN_GRB,
Common::kPlatformAmiga,
@@ -469,7 +478,6 @@
{
"os",
"alt",
- ARRAYSIZE(OSAmigaAlt_GameFiles),
OSAmigaAlt_GameFiles,
Common::EN_GRB,
Common::kPlatformAmiga,
@@ -482,7 +490,6 @@
{
"os",
"",
- ARRAYSIZE(OSAmigaUS_GameFiles),
OSAmigaUS_GameFiles,
Common::EN_USA,
Common::kPlatformAmiga,
@@ -495,7 +502,6 @@
{
"os",
"",
- ARRAYSIZE(OSAmigaDE_GameFiles),
OSAmigaDE_GameFiles,
Common::DE_DEU,
Common::kPlatformAmiga,
@@ -508,7 +514,6 @@
{
"os",
"",
- ARRAYSIZE(OSAmigaES_GameFiles),
OSAmigaES_GameFiles,
Common::ES_ESP,
Common::kPlatformAmiga,
@@ -521,7 +526,6 @@
{
"os",
"",
- ARRAYSIZE(OSAmigaFR_GameFiles),
OSAmigaFR_GameFiles,
Common::FR_FRA,
Common::kPlatformAmiga,
@@ -534,7 +538,6 @@
{
"os",
"Demo",
- ARRAYSIZE(OSAmigaDemo_GameFiles),
OSAmigaDemo_GameFiles,
Common::EN_GRB,
Common::kPlatformAmiga,
@@ -547,7 +550,6 @@
{
"os",
"",
- ARRAYSIZE(OSST_GameFiles),
OSST_GameFiles,
Common::EN_GRB,
Common::kPlatformAtariST,
@@ -560,7 +562,6 @@
{
"os",
"",
- ARRAYSIZE(OSSTFR_GameFiles),
OSSTFR_GameFiles,
Common::FR_FRA,
Common::kPlatformAtariST,
@@ -569,7 +570,7 @@
0,
},
- { { NULL, NULL, 0, NULL, Common::UNK_LANG, Common::kPlatformUnknown }, 0, 0 }
+ { { NULL, NULL, NULL, Common::UNK_LANG, Common::kPlatformUnknown }, 0, 0 }
};
bool CineEngine::initGame() {
Modified: scummvm/trunk/engines/kyra/plugin.cpp
===================================================================
--- scummvm/trunk/engines/kyra/plugin.cpp 2006-12-19 03:52:04 UTC (rev 24881)
+++ scummvm/trunk/engines/kyra/plugin.cpp 2006-12-19 04:35:08 UTC (rev 24882)
@@ -50,59 +50,73 @@
#define ENTRY(f, x) { f, 0, x }
const ADGameFileDescription kyra1EnglishFloppy1[] = {
- ENTRY("GEMCUT.EMC", "3c244298395520bb62b5edfe41688879")
+ ENTRY("GEMCUT.EMC", "3c244298395520bb62b5edfe41688879"),
+ { NULL, 0, NULL}
};
const ADGameFileDescription kyra1EnglishFloppy2[] = {
- ENTRY("GEMCUT.EMC", "796e44863dd22fa635b042df1bf16673")
+ ENTRY("GEMCUT.EMC", "796e44863dd22fa635b042df1bf16673"),
+ { NULL, 0, NULL}
};
const ADGameFileDescription kyra1FrenchFloppy1[] = {
- ENTRY("GEMCUT.EMC", "abf8eb360e79a6c2a837751fbd4d3d24")
+ ENTRY("GEMCUT.EMC", "abf8eb360e79a6c2a837751fbd4d3d24"),
+ { NULL, 0, NULL}
};
const ADGameFileDescription kyra1GermanFloppy1[] = {
- ENTRY("GEMCUT.EMC", "6018e1dfeaca7fe83f8d0b00eb0dd049")
+ ENTRY("GEMCUT.EMC", "6018e1dfeaca7fe83f8d0b00eb0dd049"),
+ { NULL, 0, NULL}
};
const ADGameFileDescription kyra1GermanFloppy2[] = {
- ENTRY("GEMCUT.EMC", "f0b276781f47c130f423ec9679fe9ed9")
+ ENTRY("GEMCUT.EMC", "f0b276781f47c130f423ec9679fe9ed9"),
+ { NULL, 0, NULL}
};
const ADGameFileDescription kyra1SpanishFloppy1[] = {
- ENTRY("GEMCUT.EMC", "8909b41596913b3f5deaf3c9f1017b01")
+ ENTRY("GEMCUT.EMC", "8909b41596913b3f5deaf3c9f1017b01"),
+ { NULL, 0, NULL}
};
const ADGameFileDescription kyra1SpanishFloppy2[] = {
- ENTRY("GEMCUT.EMC", "747861d2a9c643c59fdab570df5b9093")
+ ENTRY("GEMCUT.EMC", "747861d2a9c643c59fdab570df5b9093"),
+ { NULL, 0, NULL}
};
const ADGameFileDescription kyra1ItalianFloppy1[] = {
- ENTRY("GEMCUT.EMC", "ef08c8c237ee1473fd52578303fc36df")
+ ENTRY("GEMCUT.EMC", "ef08c8c237ee1473fd52578303fc36df"),
+ { NULL, 0, NULL}
};
const ADGameFileDescription kyra1EnglishCD1[] = {
- ENTRY("GEMCUT.PAK", "fac399fe62f98671e56a005c5e94e39f")
+ ENTRY("GEMCUT.PAK", "fac399fe62f98671e56a005c5e94e39f"),
+ { NULL, 0, NULL}
};
const ADGameFileDescription kyra1GermanCD1[] = {
- ENTRY("GEMCUT.PAK", "230f54e6afc007ab4117159181a1c722")
+ ENTRY("GEMCUT.PAK", "230f54e6afc007ab4117159181a1c722"),
+ { NULL, 0, NULL}
};
const ADGameFileDescription kyra1FrenchCD1[] = {
- ENTRY("GEMCUT.PAK", "b037c41768b652a040360ffa3556fd2a")
+ ENTRY("GEMCUT.PAK", "b037c41768b652a040360ffa3556fd2a"),
+ { NULL, 0, NULL}
};
const ADGameFileDescription kyra1EnglishDemo1[] = {
- ENTRY("DEMO1.WSA", "fb722947d94897512b13b50cc84fd648")
+ ENTRY("DEMO1.WSA", "fb722947d94897512b13b50cc84fd648"),
+ { NULL, 0, NULL}
};
const ADGameFileDescription kyra2UnknownUnknown1[] = {
- ENTRY("FATE.PAK", "28cbad1c5bf06b2d3825ae57d760d032")
+ ENTRY("FATE.PAK", "28cbad1c5bf06b2d3825ae57d760d032"),
+ { NULL, 0, NULL}
};
const ADGameFileDescription kyra3CD1[] = {
- ENTRY("ONETIME.PAK", "3833ff312757b8e6147f464cca0a6587")
+ ENTRY("ONETIME.PAK", "3833ff312757b8e6147f464cca0a6587"),
+ { NULL, 0, NULL}
};
#define FLAGS(x, y, z, w, id) { UNK_LANG, kPlatformUnknown, x, y, z, w, id }
@@ -116,25 +130,25 @@
#define KYRA3_CD_FLAGS FLAGS(false, false, false, true, GI_KYRA3)
const KYRAGameDescription adGameDescs[] = {
- { { "The Legend of Kyrandia", 0, ARRAYSIZE(kyra1EnglishFloppy1), kyra1EnglishFloppy1, EN_ANY, kPlatformPC }, "kyra1", KYRA1_FLOPPY_FLAGS },
- { { "The Legend of Kyrandia", 0, ARRAYSIZE(kyra1EnglishFloppy2), kyra1EnglishFloppy2, EN_ANY, kPlatformPC }, "kyra1", KYRA1_FLOPPY_FLAGS },
- { { "The Legend of Kyrandia", 0, ARRAYSIZE(kyra1FrenchFloppy1) , kyra1FrenchFloppy1 , FR_FRA, kPlatformPC }, "kyra1", KYRA1_FLOPPY_FLAGS },
- { { "The Legend of Kyrandia", 0, ARRAYSIZE(kyra1GermanFloppy1) , kyra1GermanFloppy1 , DE_DEU, kPlatformPC }, "kyra1", KYRA1_FLOPPY_FLAGS },
- { { "The Legend of Kyrandia", 0, ARRAYSIZE(kyra1GermanFloppy2) , kyra1GermanFloppy2 , DE_DEU, kPlatformPC }, "kyra1", KYRA1_FLOPPY_FLAGS }, // from Arne.F
- { { "The Legend of Kyrandia", 0, ARRAYSIZE(kyra1SpanishFloppy1), kyra1SpanishFloppy1, ES_ESP, kPlatformPC }, "kyra1", KYRA1_FLOPPY_FLAGS }, // from VooD
- { { "The Legend of Kyrandia", 0, ARRAYSIZE(kyra1SpanishFloppy2), kyra1SpanishFloppy2, ES_ESP, kPlatformPC }, "kyra1", KYRA1_FLOPPY_FLAGS }, // floppy 1.8 from clemmy
- { { "The Legend of Kyrandia", 0, ARRAYSIZE(kyra1ItalianFloppy1), kyra1ItalianFloppy1, IT_ITA, kPlatformPC }, "kyra1", KYRA1_FLOPPY_FLAGS }, // from gourry
+ { { "The Legend of Kyrandia", 0, kyra1EnglishFloppy1, EN_ANY, kPlatformPC }, "kyra1", KYRA1_FLOPPY_FLAGS },
+ { { "The Legend of Kyrandia", 0, kyra1EnglishFloppy2, EN_ANY, kPlatformPC }, "kyra1", KYRA1_FLOPPY_FLAGS },
+ { { "The Legend of Kyrandia", 0, kyra1FrenchFloppy1 , FR_FRA, kPlatformPC }, "kyra1", KYRA1_FLOPPY_FLAGS },
+ { { "The Legend of Kyrandia", 0, kyra1GermanFloppy1 , DE_DEU, kPlatformPC }, "kyra1", KYRA1_FLOPPY_FLAGS },
+ { { "The Legend of Kyrandia", 0, kyra1GermanFloppy2 , DE_DEU, kPlatformPC }, "kyra1", KYRA1_FLOPPY_FLAGS }, // from Arne.F
+ { { "The Legend of Kyrandia", 0, kyra1SpanishFloppy1, ES_ESP, kPlatformPC }, "kyra1", KYRA1_FLOPPY_FLAGS }, // from VooD
+ { { "The Legend of Kyrandia", 0, kyra1SpanishFloppy2, ES_ESP, kPlatformPC }, "kyra1", KYRA1_FLOPPY_FLAGS }, // floppy 1.8 from clemmy
+ { { "The Legend of Kyrandia", 0, kyra1ItalianFloppy1, IT_ITA, kPlatformPC }, "kyra1", KYRA1_FLOPPY_FLAGS }, // from gourry
- { { "The Legend of Kyrandia", "CD", ARRAYSIZE(kyra1EnglishCD1), kyra1EnglishCD1, EN_ANY, kPlatformPC }, "kyra1", KYRA1_CD_FLAGS },
- { { "The Legend of Kyrandia", "CD", ARRAYSIZE(kyra1GermanCD1) , kyra1GermanCD1 , DE_DEU, kPlatformPC }, "kyra1", KYRA1_CD_FLAGS },
- { { "The Legend of Kyrandia", "CD", ARRAYSIZE(kyra1FrenchCD1) , kyra1FrenchCD1 , FR_FRA, kPlatformPC }, "kyra1", KYRA1_CD_FLAGS },
+ { { "The Legend of Kyrandia", "CD", kyra1EnglishCD1, EN_ANY, kPlatformPC }, "kyra1", KYRA1_CD_FLAGS },
+ { { "The Legend of Kyrandia", "CD", kyra1GermanCD1 , DE_DEU, kPlatformPC }, "kyra1", KYRA1_CD_FLAGS },
+ { { "The Legend of Kyrandia", "CD", kyra1FrenchCD1 , FR_FRA, kPlatformPC }, "kyra1", KYRA1_CD_FLAGS },
- { { "The Legend of Kyrandia", "Demo", ARRAYSIZE(kyra1EnglishDemo1), kyra1EnglishDemo1, EN_ANY, kPlatformPC }, "kyra1", KYRA1_DEMO_FLAGS },
+ { { "The Legend of Kyrandia", "Demo", kyra1EnglishDemo1, EN_ANY, kPlatformPC }, "kyra1", KYRA1_DEMO_FLAGS },
- { { "The Legend of Kyrandia: The Hand of Fate", 0, ARRAYSIZE(kyra2UnknownUnknown1), kyra2UnknownUnknown1, UNK_LANG, kPlatformPC }, "kyra2", KYRA2_UNK_FLAGS }, // check this! (cd version?)
+ { { "The Legend of Kyrandia: The Hand of Fate", 0, kyra2UnknownUnknown1, UNK_LANG, kPlatformPC }, "kyra2", KYRA2_UNK_FLAGS }, // check this! (cd version?)
- { { "The Legend of Kyrandia: Malcolm's Revenge", 0, ARRAYSIZE(kyra3CD1), kyra3CD1, UNK_LANG, kPlatformPC }, "kyra3", KYRA3_CD_FLAGS },
- { { NULL, NULL, 0, NULL, UNK_LANG, kPlatformUnknown }, NULL, KYRA2_UNK_FLAGS }
+ { { "The Legend of Kyrandia: Malcolm's Revenge", 0, kyra3CD1, UNK_LANG, kPlatformPC }, "kyra3", KYRA3_CD_FLAGS },
+ { { NULL, NULL, NULL, UNK_LANG, kPlatformUnknown }, NULL, KYRA2_UNK_FLAGS }
};
ADGameDescList getADDescList() {
@@ -170,8 +184,13 @@
int curID = 0;
// get's the entry which has most files to check (most specialized)
for (ADList::const_iterator i = list.begin(); i != list.end(); ++i, ++curID) {
- if (filesCount < adGameDescs[*i].desc.filesCount) {
- filesCount = adGameDescs[*i].desc.filesCount;
+ int fCount = 0;
+
+ for (int j = 0; adGameDescs[*i].desc.filesDescriptions[j].fileName; j++)
+ fCount++;
+
+ if (filesCount < fCount) {
+ filesCount = fCount;
id = curID;
}
}
Modified: scummvm/trunk/engines/saga/rscfile.cpp
===================================================================
--- scummvm/trunk/engines/saga/rscfile.cpp 2006-12-19 03:52:04 UTC (rev 24881)
+++ scummvm/trunk/engines/saga/rscfile.cpp 2006-12-19 04:35:08 UTC (rev 24882)
@@ -340,7 +340,11 @@
bool Resource::createContexts() {
int i;
ResourceContext *context;
- _contextsCount = _vm->getGameDescription()->desc.filesCount;
+
+ _contextsCount = 0;
+ for (i = 0; _vm->getGameDescription()->desc.filesDescriptions[i].fileName; i++)
+ _contextsCount++;
+
_contexts = (ResourceContext*)calloc(_contextsCount, sizeof(*_contexts));
for (i = 0; i < _contextsCount; i++) {
Modified: scummvm/trunk/engines/saga/sagagame.cpp
===================================================================
--- scummvm/trunk/engines/saga/sagagame.cpp 2006-12-19 03:52:04 UTC (rev 24881)
+++ scummvm/trunk/engines/saga/sagagame.cpp 2006-12-19 04:35:08 UTC (rev 24882)
@@ -181,7 +181,8 @@
{"ite.rsc", GAME_RESOURCEFILE, "986c79c4d2939dbe555576529fd37932"},
//{"ite.dmo", GAME_DEMOFILE}, "0b9a70eb4e120b6f00579b46c8cae29e"
{"scripts.rsc", GAME_SCRIPTFILE, "d5697dd3240a3ceaddaa986c47e1a2d7"},
- {"voices.rsc", GAME_SOUNDFILE | GAME_VOICEFILE, "c58e67c506af4ffa03fd0aac2079deb0"}
+ {"voices.rsc", GAME_SOUNDFILE | GAME_VOICEFILE, "c58e67c506af4ffa03fd0aac2079deb0"},
+ { NULL, 0, NULL}
};
static const GameFontDescription ITEDEMO_GameFonts[] = {
@@ -204,14 +205,16 @@
{"ited.rsc", GAME_RESOURCEFILE, "3a450852cbf3c80773984d565647e6ac"},
{"scriptsd.rsc", GAME_SCRIPTFILE, "3f12b67fa93e56e1a6be39d2921d80bb"},
{"soundsd.rsc", GAME_SOUNDFILE, "95a6c148e22e99a8c243f2978223583c"},
- {"voicesd.rsc", GAME_VOICEFILE, "e139d86bab2ee8ba3157337f894a92d4"}
+ {"voicesd.rsc", GAME_VOICEFILE, "e139d86bab2ee8ba3157337f894a92d4"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription ITE_WINDEMO1_GameFiles[] = {
{"ited.rsc", GAME_RESOURCEFILE, "3a450852cbf3c80773984d565647e6ac"},
{"scriptsd.rsc", GAME_SCRIPTFILE, "3f12b67fa93e56e1a6be39d2921d80bb"},
{"soundsd.rsc", GAME_SOUNDFILE, "a741139dd7365a13f463cd896ff9969a"},
- {"voicesd.rsc", GAME_VOICEFILE, "0759eaf5b64ae19fd429920a70151ad3"}
+ {"voicesd.rsc", GAME_VOICEFILE, "0759eaf5b64ae19fd429920a70151ad3"},
+ { NULL, 0, NULL}
};
static const GameFontDescription ITEWINDEMO_GameFonts[] = {
@@ -252,7 +255,8 @@
{"scriptsd.rsc", GAME_SCRIPTFILE, "fded5c59b8b7c5976229f960d21e6b0b"},
{"soundsd.rsc", GAME_SOUNDFILE, "b3a831fbed337d1f1300fee1dd474f6c"},
{"voicesd.rsc", GAME_VOICEFILE, "e139d86bab2ee8ba3157337f894a92d4"},
- {"musicd.rsc", GAME_MUSICFILE, "495bdde51fd9f4bea2b9c911091b1ab2"}
+ {"musicd.rsc", GAME_MUSICFILE, "495bdde51fd9f4bea2b9c911091b1ab2"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription ITE_MACDEMO1_GameFiles[] = {
@@ -260,7 +264,8 @@
{"scriptsd.rsc", GAME_SCRIPTFILE, "fded5c59b8b7c5976229f960d21e6b0b"},
{"soundsd.rsc", GAME_SOUNDFILE, "b3a831fbed337d1f1300fee1dd474f6c"},
{"voicesd.rsc", GAME_VOICEFILE, "e139d86bab2ee8ba3157337f894a92d4"},
- {"musicd.rsc", GAME_MUSICFILE, "1a91cd60169f367ecb6c6e058d899b2f"}
+ {"musicd.rsc", GAME_MUSICFILE, "1a91cd60169f367ecb6c6e058d899b2f"},
+ { NULL, 0, NULL}
};
static const GameSoundInfo ITEMACDEMO_GameVoice = {
@@ -296,7 +301,8 @@
{"scriptsd.rsc", GAME_SCRIPTFILE, "3f12b67fa93e56e1a6be39d2921d80bb"},
{"soundsd.rsc", GAME_SOUNDFILE, "95a6c148e22e99a8c243f2978223583c"},
{"voicesd.rsc", GAME_VOICEFILE, "e139d86bab2ee8ba3157337f894a92d4"},
- {"musicd.rsc", GAME_MUSICFILE, "d6454756517f042f01210458abe8edd4"}
+ {"musicd.rsc", GAME_MUSICFILE, "d6454756517f042f01210458abe8edd4"},
+ { NULL, 0, NULL}
};
static const GameSoundInfo ITELINDEMO_GameMusic = {
@@ -315,7 +321,8 @@
{"scripts.rsc", GAME_SCRIPTFILE, "a891405405edefc69c9d6c420c868b84"},
{"sounds.rsc", GAME_SOUNDFILE, "e2ccb61c325d6d1ead3be0e731fe29fe"},
{"voices.rsc", GAME_VOICEFILE, "41bb6b95d792dde5196bdb78740895a6"},
- {"music.rsc", GAME_MUSICFILE, "d6454756517f042f01210458abe8edd4"}
+ {"music.rsc", GAME_MUSICFILE, "d6454756517f042f01210458abe8edd4"},
+ { NULL, 0, NULL}
};
// Inherit the Earth - Wyrmkeep combined Windows/Mac/Linux version. This
@@ -329,7 +336,8 @@
{"scripts.rsc", GAME_SCRIPTFILE, "a891405405edefc69c9d6c420c868b84"},
{"sounds.rsc", GAME_SOUNDFILE, "e2ccb61c325d6d1ead3be0e731fe29fe"},
{"inherit the earth voices", GAME_VOICEFILE | GAME_SWAPENDIAN, "c14c4c995e7a0d3828e3812a494301b7"},
- {"music.rsc", GAME_MUSICFILE, "d6454756517f042f01210458abe8edd4"}
+ {"music.rsc", GAME_MUSICFILE, "d6454756517f042f01210458abe8edd4"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription ITE_MACCD_G_GameFiles[] = {
@@ -337,7 +345,8 @@
{"ite scripts.bin", GAME_SCRIPTFILE | GAME_MACBINARY, "af0d7a2588e09ad3ecbc5b474ea238bf"},
{"ite sounds.bin", GAME_SOUNDFILE | GAME_MACBINARY, "441426c6bb2a517f65c7e49b57f7a345"},
{"ite music.bin", GAME_MUSICFILE_GM | GAME_MACBINARY, "c1d20324b7cdf1650e67061b8a93251c"},
- {"ite voices.bin", GAME_VOICEFILE | GAME_MACBINARY, "dba92ae7d57e942250fe135609708369"}
+ {"ite voices.bin", GAME_VOICEFILE | GAME_MACBINARY, "dba92ae7d57e942250fe135609708369"},
+ { NULL, 0, NULL}
};
static const GameSoundInfo ITEMACCD_G_GameSound = {
@@ -355,7 +364,8 @@
{"scripts.rsc", GAME_SCRIPTFILE, "adf1f46c1d0589083996a7060c798ad0"},
{"sounds.rsc", GAME_SOUNDFILE, "95863b89a0916941f6c5e1789843ba14"},
{"inherit the earth voices", GAME_VOICEFILE, "c14c4c995e7a0d3828e3812a494301b7"},
- {"music.rsc", GAME_MUSICFILE, "1a91cd60169f367ecb6c6e058d899b2f"}
+ {"music.rsc", GAME_MUSICFILE, "1a91cd60169f367ecb6c6e058d899b2f"},
+ { NULL, 0, NULL}
};
static const GameSoundInfo ITEMACCD_GameSound = {
@@ -380,27 +390,31 @@
static const ADGameFileDescription ITE_DISK_DE_GameFiles[] = {
{"ite.rsc", GAME_RESOURCEFILE, "869fc23c8f38f575979ec67152914fee"},
{"scripts.rsc", GAME_SCRIPTFILE, "516f7330f8410057b834424ea719d1ef"},
- {"voices.rsc", GAME_SOUNDFILE | GAME_VOICEFILE, "0c9113e630f97ef0996b8c3114badb08"}
+ {"voices.rsc", GAME_SOUNDFILE | GAME_VOICEFILE, "0c9113e630f97ef0996b8c3114badb08"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription ITE_DISK_G_GameFiles[] = {
{"ite.rsc", GAME_RESOURCEFILE, "8f4315a9bb10ec839253108a032c8b54"},
{"scripts.rsc", GAME_SCRIPTFILE, "516f7330f8410057b834424ea719d1ef"},
- {"voices.rsc", GAME_SOUNDFILE | GAME_VOICEFILE, "c46e4392fcd2e89bc91e5567db33b62d"}
+ {"voices.rsc", GAME_SOUNDFILE | GAME_VOICEFILE, "c46e4392fcd2e89bc91e5567db33b62d"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription ITE_DISK_DE2_GameFiles[] = {
{"ite.rsc", GAME_RESOURCEFILE, "869fc23c8f38f575979ec67152914fee"},
{"scripts.rsc", GAME_SCRIPTFILE, "516f7330f8410057b834424ea719d1ef"},
{"voices.rsc", GAME_SOUNDFILE | GAME_VOICEFILE, "0c9113e630f97ef0996b8c3114badb08"},
- {"music.rsc", GAME_MUSICFILE, "d6454756517f042f01210458abe8edd4"}
+ {"music.rsc", GAME_MUSICFILE, "d6454756517f042f01210458abe8edd4"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription ITE_DISK_G2_GameFiles[] = {
{"ite.rsc", GAME_RESOURCEFILE, "8f4315a9bb10ec839253108a032c8b54"},
{"scripts.rsc", GAME_SCRIPTFILE, "516f7330f8410057b834424ea719d1ef"},
{"voices.rsc", GAME_SOUNDFILE | GAME_VOICEFILE, "c46e4392fcd2e89bc91e5567db33b62d"},
- {"music.rsc", GAME_MUSICFILE, "d6454756517f042f01210458abe8edd4"}
+ {"music.rsc", GAME_MUSICFILE, "d6454756517f042f01210458abe8edd4"},
+ { NULL, 0, NULL}
};
static const GameFontDescription ITEDISK_GameFonts[] = {
@@ -423,14 +437,16 @@
{"ite.rsc", GAME_RESOURCEFILE, "8f4315a9bb10ec839253108a032c8b54"},
{"scripts.rsc", GAME_SCRIPTFILE, "a891405405edefc69c9d6c420c868b84"},
{"sounds.rsc", GAME_SOUNDFILE, "e2ccb61c325d6d1ead3be0e731fe29fe"},
- {"voices.rsc", GAME_VOICEFILE, "41bb6b95d792dde5196bdb78740895a6"}
+ {"voices.rsc", GAME_VOICEFILE, "41bb6b95d792dde5196bdb78740895a6"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription ITE_CD_G_GameFiles[] = {
{"ite.rsc", GAME_RESOURCEFILE, "8f4315a9bb10ec839253108a032c8b54"},
{"scripts.rsc", GAME_SCRIPTFILE, "50a0d2d7003c926a3832d503c8534e90"},
{"sounds.rsc", GAME_SOUNDFILE, "e2ccb61c325d6d1ead3be0e731fe29fe"},
- {"voices.rsc", GAME_VOICEFILE, "41bb6b95d792dde5196bdb78740895a6"}
+ {"voices.rsc", GAME_VOICEFILE, "41bb6b95d792dde5196bdb78740895a6"},
+ { NULL, 0, NULL}
};
// reported by mld. Bestsellergamers cover disk
@@ -438,14 +454,16 @@
{"ite.rsc", GAME_RESOURCEFILE, "869fc23c8f38f575979ec67152914fee"},
{"scripts.rsc", GAME_SCRIPTFILE, "a891405405edefc69c9d6c420c868b84"},
{"sounds.rsc", GAME_SOUNDFILE, "e2ccb61c325d6d1ead3be0e731fe29fe"},
- {"voices.rsc", GAME_VOICEFILE, "2fbad5d10b9b60a3415dc4aebbb11718"}
+ {"voices.rsc", GAME_VOICEFILE, "2fbad5d10b9b60a3415dc4aebbb11718"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription ITE_CD_GameFiles[] = {
{"ite.rsc", GAME_RESOURCEFILE, "8f4315a9bb10ec839253108a032c8b54"},
{"scripts.rsc", GAME_SCRIPTFILE, "a891405405edefc69c9d6c420c868b84"},
{"sounds.rsc", GAME_SOUNDFILE, "e2ccb61c325d6d1ead3be0e731fe29fe"},
- {"voices.rsc", GAME_VOICEFILE, "41bb6b95d792dde5196bdb78740895a6"}
+ {"voices.rsc", GAME_VOICEFILE, "41bb6b95d792dde5196bdb78740895a6"},
+ { NULL, 0, NULL}
};
@@ -454,7 +472,8 @@
{"scripts.rsc", GAME_SCRIPTFILE, "50a0d2d7003c926a3832d503c8534e90"},
{"sounds.rsc", GAME_SOUNDFILE, "e2ccb61c325d6d1ead3be0e731fe29fe"},
{"voices.rsc", GAME_VOICEFILE, "41bb6b95d792dde5196bdb78740895a6"},
- {"music.rsc", GAME_MUSICFILE, "d6454756517f042f01210458abe8edd4"}
+ {"music.rsc", GAME_MUSICFILE, "d6454756517f042f01210458abe8edd4"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription ITE_CD_DE2_GameFiles[] = {
@@ -462,7 +481,8 @@
{"scripts.rsc", GAME_SCRIPTFILE, "a891405405edefc69c9d6c420c868b84"},
{"sounds.rsc", GAME_SOUNDFILE, "e2ccb61c325d6d1ead3be0e731fe29fe"},
{"voices.rsc", GAME_VOICEFILE, "2fbad5d10b9b60a3415dc4aebbb11718"},
- {"music.rsc", GAME_MUSICFILE, "d6454756517f042f01210458abe8edd4"}
+ {"music.rsc", GAME_MUSICFILE, "d6454756517f042f01210458abe8edd4"},
+ { NULL, 0, NULL}
};
@@ -699,7 +719,8 @@
{"scream.res", GAME_RESOURCEFILE, "46bbdc65d164ba7e89836a0935eec8e6"},
{"scripts.res", GAME_SCRIPTFILE, "9626bda8978094ff9b29198bc1ed5f9a"},
{"sfx.res", GAME_SOUNDFILE, "1c610d543f32ec8b525e3f652536f269"},
- {"voicesd.res", GAME_VOICEFILE, "3bbc16a8f741dbb511da506c660a0b54"}
+ {"voicesd.res", GAME_VOICEFILE, "3bbc16a8f741dbb511da506c660a0b54"},
+ { NULL, 0, NULL}
};
// I Have No Mouth and I Must Scream - Retail CD version
@@ -717,7 +738,8 @@
{"voices3.res", GAME_VOICEFILE, "3bbc16a8f741dbb511da506c660a0b54"},
{"voices4.res", GAME_VOICEFILE, "ebfa160122d2247a676ca39920e5d481"},
{"voices5.res", GAME_VOICEFILE, "1f501ce4b72392bdd1d9ec38f6eec6da"},
- {"voices6.res", GAME_VOICEFILE, "f580ed7568c7d6ef34e934ba20adf834"}
+ {"voices6.res", GAME_VOICEFILE, "f580ed7568c7d6ef34e934ba20adf834"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription IHNM_CD_ES_GameFiles[] = {
@@ -733,7 +755,8 @@
{"voices3.res", GAME_VOICEFILE, "dc6a5fa7a4cdc2ca5a6fd924e969986c"},
{"voices4.res", GAME_VOICEFILE, "0f87400b804232a58dd22e404420cc45"},
{"voices5.res", GAME_VOICEFILE, "172668cfc5d8c305cb5b1a9b4d995fc0"},
- {"voices6.res", GAME_VOICEFILE, "96c9bda9a5f41d6bc232ed7bf6d371d9"}
+ {"voices6.res", GAME_VOICEFILE, "96c9bda9a5f41d6bc232ed7bf6d371d9"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription IHNM_CD_RU_GameFiles[] = {
@@ -749,7 +772,8 @@
{"voices3.res", GAME_VOICEFILE, "ebb9501283047f27a0f54e27b3c8ba1e"},
{"voices4.res", GAME_VOICEFILE, "4c145da5fa6d1306162a7ca8ce5a4f2e"},
{"voices5.res", GAME_VOICEFILE, "871a559644281917677eca4af1b05620"},
- {"voices6.res", GAME_VOICEFILE, "211be5c24f066d69a2f6cfa953acfba6"}
+ {"voices6.res", GAME_VOICEFILE, "211be5c24f066d69a2f6cfa953acfba6"},
+ { NULL, 0, NULL}
};
// I Have No Mouth and I Must Scream - Censored CD version (without Nimdok)
@@ -767,7 +791,8 @@
{"voices2.res", GAME_VOICEFILE, "c270e0980782af43641a86e4a14e2a32"},
{"voices3.res", GAME_VOICEFILE, "49e42befea883fd101ec3d0f5d0647b9"},
{"voices5.res", GAME_VOICEFILE, "c477443c52a0aa56e686ebd8d051e4ab"},
- {"voices6.res", GAME_VOICEFILE, "2b9aea838f74b4eecfb29a8f205a2bd4"}
+ {"voices6.res", GAME_VOICEFILE, "2b9aea838f74b4eecfb29a8f205a2bd4"},
+ { NULL, 0, NULL}
};
static const ADGameFileDescription IHNM_CD_FR_GameFiles[] = {
@@ -782,7 +807,8 @@
{"voices2.res", GAME_VOICEFILE, "c2d93a35d2c2def9c3d6d242576c794b"},
{"voices3.res", GAME_VOICEFILE, "49e42befea883fd101ec3d0f5d0647b9"},
{"voices5.res", GAME_VOICEFILE, "f4c415de7c03de86b73f9a12b8bd632f"},
- {"voices6.res", GAME_VOICEFILE, "3fc5358a5d8eee43bdfab2740276572e"}
+ {"voices6.res", GAME_VOICEFILE, "3fc5358a5d8eee43bdfab2740276572e"},
+ { NULL, 0, NULL}
};
static const GameFontDescription IHNMDEMO_GameFonts[] = {
@@ -819,7 +845,6 @@
{
"ite",
"Demo", // Game title
- ARRAYSIZE(ITE_DEMO_G_GameFiles), // Game datafiles
ITE_DEMO_G_GameFiles,
Common::EN_ANY,
Common::kPlatformPC,
@@ -844,7 +869,6 @@
{
"ite",
"Demo",
- ARRAYSIZE(ITE_MACDEMO2_GameFiles),
ITE_MACDEMO2_GameFiles,
Common::EN_ANY,
Common::kPlatformMacintosh,
@@ -869,7 +893,6 @@
{
"ite",
"early Demo",
- ARRAYSIZE(ITE_MACDEMO1_GameFiles),
ITE_MACDEMO1_GameFiles,
Common::EN_ANY,
Common::kPlatformMacintosh,
@@ -894,7 +917,6 @@
{
"ite",
"CD",
- ARRAYSIZE(ITE_MACCD_G_GameFiles),
ITE_MACCD_G_GameFiles,
Common::EN_ANY,
Common::kPlatformMacintosh,
@@ -919,7 +941,6 @@
{
"ite",
"Wyrmkeep CD",
- ARRAYSIZE(ITE_MACCD_GameFiles),
ITE_MACCD_GameFiles,
Common::EN_ANY,
Common::kPlatformMacintosh,
@@ -945,7 +966,6 @@
{
"ite",
"Demo",
- ARRAYSIZE(ITE_LINDEMO_GameFiles),
ITE_LINDEMO_GameFiles,
Common::EN_ANY,
Common::kPlatformLinux,
@@ -970,7 +990,6 @@
{
"ite",
"Demo",
- ARRAYSIZE(ITE_WINDEMO2_GameFiles),
ITE_WINDEMO2_GameFiles,
Common::EN_ANY,
Common::kPlatformWindows,
@@ -995,7 +1014,6 @@
{
"ite",
"early Demo",
- ARRAYSIZE(ITE_WINDEMO1_GameFiles),
ITE_WINDEMO1_GameFiles,
Common::EN_ANY,
Common::kPlatformWindows,
@@ -1020,7 +1038,6 @@
{
"ite",
"Multi-OS CD Version",
- ARRAYSIZE(ITE_MULTICD_GameFiles),
ITE_MULTICD_GameFiles,
Common::EN_ANY,
Common::kPlatformUnknown,
@@ -1045,7 +1062,6 @@
{
"ite",
"CD Version",
- ARRAYSIZE(ITE_LINCD_GameFiles),
ITE_LINCD_GameFiles,
Common::EN_ANY,
Common::kPlatformLinux,
@@ -1070,7 +1086,6 @@
{
"ite",
"CD Version",
- ARRAYSIZE(ITE_WINCD_GameFiles),
ITE_WINCD_GameFiles,
Common::EN_ANY,
Common::kPlatformWindows,
@@ -1095,7 +1110,6 @@
{
"ite",
"CD Version",
- ARRAYSIZE(ITE_CD_G_GameFiles),
ITE_CD_G_GameFiles,
Common::EN_ANY,
Common::kPlatformPC,
@@ -1120,7 +1134,6 @@
{
"ite",
"CD Version",
- ARRAYSIZE(ITE_CD_G2_GameFiles),
ITE_CD_G2_GameFiles,
Common::EN_ANY,
Common::kPlatformPC,
@@ -1145,7 +1158,6 @@
{
"ite",
"CD Version",
- ARRAYSIZE(ITE_CD_DE_GameFiles),
ITE_CD_DE_GameFiles,
Common::DE_DEU,
Common::kPlatformPC,
@@ -1170,7 +1182,6 @@
{
"ite",
"CD Version",
- ARRAYSIZE(ITE_CD_DE2_GameFiles),
ITE_CD_DE2_GameFiles,
Common::DE_DEU,
Common::kPlatformPC,
@@ -1195,7 +1206,6 @@
{
"ite",
"CD Version",
- ARRAYSIZE(ITE_CD_GameFiles),
ITE_CD_GameFiles,
Common::EN_ANY,
Common::kPlatformPC,
@@ -1220,7 +1230,6 @@
{
"ite",
"Floppy",
- ARRAYSIZE(ITE_DISK_DE_GameFiles),
ITE_DISK_DE_GameFiles,
Common::DE_DEU,
Common::kPlatformPC,
@@ -1245,7 +1254,6 @@
{
"ite",
"Floppy",
- ARRAYSIZE(ITE_DISK_DE2_GameFiles),
ITE_DISK_DE2_GameFiles,
Common::DE_DEU,
Common::kPlatformPC,
@@ -1270,7 +1278,6 @@
{
"ite",
"Floppy",
- ARRAYSIZE(ITE_DISK_G_GameFiles),
ITE_DISK_G_GameFiles,
Common::EN_ANY,
Common::kPlatformPC,
@@ -1295,7 +1302,6 @@
{
"ite",
"Floppy",
- ARRAYSIZE(ITE_DISK_G2_GameFiles),
ITE_DISK_G2_GameFiles,
Common::EN_ANY,
Common::kPlatformPC,
@@ -1320,7 +1326,6 @@
{
"ihnm",
"Demo",
- ARRAYSIZE(IHNM_DEMO_GameFiles),
IHNM_DEMO_GameFiles,
Common::EN_ANY,
Common::kPlatformPC,
@@ -1345,7 +1350,6 @@
{
"ihnm",
"",
- ARRAYSIZE(IHNM_CD_GameFiles),
IHNM_CD_GameFiles,
Common::EN_ANY,
Common::kPlatformPC,
@@ -1370,7 +1374,6 @@
{
"ihnm",
"",
- ARRAYSIZE(IHNM_CD_DE_GameFiles),
IHNM_CD_DE_GameFiles,
Common::DE_DEU,
Common::kPlatformPC,
@@ -1395,7 +1398,6 @@
{
"ihnm",
"",
- ARRAYSIZE(IHNM_CD_ES_GameFiles),
IHNM_CD_ES_GameFiles,
Common::ES_ESP,
Common::kPlatformPC,
@@ -1420,7 +1422,6 @@
{
"ihnm",
"",
- ARRAYSIZE(IHNM_CD_RU_GameFiles),
IHNM_CD_RU_GameFiles,
Common::RU_RUS,
Common::kPlatformPC,
@@ -1445,7 +1446,6 @@
{
"ihnm",
"",
- ARRAYSIZE(IHNM_CD_FR_GameFiles),
IHNM_CD_FR_GameFiles,
Common::FR_FRA,
Common::kPlatformPC,
@@ -1464,5 +1464,5 @@
0,
NULL,
},
- { { NULL, NULL, 0, NULL, Common::UNK_LANG, Common::kPlatformUnknown }, 0, 0, 0, NULL, 0, NULL, 0, NULL, NULL, NULL, NULL, 0, NULL }
+ { { NULL, NULL, NULL, Common::UNK_LANG, Common::kPlatformUnknown }, 0, 0, 0, NULL, 0, NULL, 0, NULL, NULL, NULL, NULL, 0, NULL }
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list