thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DETECTOR: Change ADFileBasedFallback::desc to ADGameDescription pointer

Browse source
This commit is contained in:
Max Horn 2011-06-14 18:21:44 +02:00
parent 5016645345
commit d9a996e6ef
4 changed files with 33 additions and 33 deletions
Download patch file Download diff file Expand all files Collapse all files

2
engines/advancedDetector.cpp
View file

@ -485,7 +485,7 @@ const ADGameDescription *AdvancedMetaEngine::detectGameFilebased(const FileMap &
const ADGameDescription *matchedDesc = 0; const ADGameDescription *matchedDesc = 0;
for (ptr = fileBasedFallback; ptr->desc; ++ptr) { for (ptr = fileBasedFallback; ptr->desc; ++ptr) {
const ADGameDescription *agdesc = (const ADGameDescription *)ptr->desc; const ADGameDescription *agdesc = ptr->desc;
int numMatchedFiles = 0; int numMatchedFiles = 0;
bool fileMissing = false; bool fileMissing = false;

2
engines/advancedDetector.h
View file

@ -105,7 +105,7 @@ struct ADFileBasedFallback {
* Pointer to an ADGameDescription or subclass thereof which will get * Pointer to an ADGameDescription or subclass thereof which will get
* returned if there's a detection match. * returned if there's a detection match.
*/ */
const void *desc; const ADGameDescription *desc;
/** /**
* A zero-terminated list of filenames used for matching. All files in * A zero-terminated list of filenames used for matching. All files in

52
engines/gob/detection_tables.h
View file

@ -5202,32 +5202,32 @@ static const GOBGameDescription fallbackDescs[] = {
}; };
static const ADFileBasedFallback fileBased[] = { static const ADFileBasedFallback fileBased[] = {
{ &fallbackDescs[ 0], { "intro.stk", "disk1.stk", "disk2.stk", "disk3.stk", "disk4.stk", 0 } }, { &fallbackDescs[ 0].desc, { "intro.stk", "disk1.stk", "disk2.stk", "disk3.stk", "disk4.stk", 0 } },
{ &fallbackDescs[ 1], { "intro.stk", "gob.lic", 0 } }, { &fallbackDescs[ 1].desc, { "intro.stk", "gob.lic", 0 } },
{ &fallbackDescs[ 2], { "intro.stk", 0 } }, { &fallbackDescs[ 2].desc, { "intro.stk", 0 } },
{ &fallbackDescs[ 2], { "intro.stk", "disk2.stk", "disk3.stk", 0 } }, { &fallbackDescs[ 2].desc, { "intro.stk", "disk2.stk", "disk3.stk", 0 } },
{ &fallbackDescs[ 3], { "intro.stk", "disk2.stk", "disk3.stk", "musmac1.mid", 0 } }, { &fallbackDescs[ 3].desc, { "intro.stk", "disk2.stk", "disk3.stk", "musmac1.mid", 0 } },
{ &fallbackDescs[ 4], { "intro.stk", "gobnew.lic", 0 } }, { &fallbackDescs[ 4].desc, { "intro.stk", "gobnew.lic", 0 } },
{ &fallbackDescs[ 5], { "intro.stk", "scaa.imd", "scba.imd", "scbf.imd", 0 } }, { &fallbackDescs[ 5].desc, { "intro.stk", "scaa.imd", "scba.imd", "scbf.imd", 0 } },
{ &fallbackDescs[ 6], { "intro.stk", "imd.itk", 0 } }, { &fallbackDescs[ 6].desc, { "intro.stk", "imd.itk", 0 } },
{ &fallbackDescs[ 7], { "intro.stk", "mus_gob3.lic", 0 } }, { &fallbackDescs[ 7].desc, { "intro.stk", "mus_gob3.lic", 0 } },
{ &fallbackDescs[ 8], { "intro.stk", "woodruff.itk", 0 } }, { &fallbackDescs[ 8].desc, { "intro.stk", "woodruff.itk", 0 } },
{ &fallbackDescs[ 9], { "intro.stk", "commun1.itk", 0 } }, { &fallbackDescs[ 9].desc, { "intro.stk", "commun1.itk", 0 } },
{ &fallbackDescs[10], { "intro.stk", "commun1.itk", "musmac1.mid", 0 } }, { &fallbackDescs[10].desc, { "intro.stk", "commun1.itk", "musmac1.mid", 0 } },
{ &fallbackDescs[11], { "intro.stk", "commun1.itk", "lost.lic", 0 } }, { &fallbackDescs[11].desc, { "intro.stk", "commun1.itk", "lost.lic", 0 } },
{ &fallbackDescs[12], { "intro.stk", "cd1.itk", "objet1.itk", 0 } }, { &fallbackDescs[12].desc, { "intro.stk", "cd1.itk", "objet1.itk", 0 } },
{ &fallbackDescs[13], { "playtoon.stk", "archi.stk", 0 } }, { &fallbackDescs[13].desc, { "playtoon.stk", "archi.stk", 0 } },
{ &fallbackDescs[14], { "playtoon.stk", "spirou.stk", 0 } }, { &fallbackDescs[14].desc, { "playtoon.stk", "spirou.stk", 0 } },
{ &fallbackDescs[15], { "playtoon.stk", "chato.stk", 0 } }, { &fallbackDescs[15].desc, { "playtoon.stk", "chato.stk", 0 } },
{ &fallbackDescs[16], { "playtoon.stk", "manda.stk", 0 } }, { &fallbackDescs[16].desc, { "playtoon.stk", "manda.stk", 0 } },
{ &fallbackDescs[17], { "playtoon.stk", "wakan.stk", 0 } }, { &fallbackDescs[17].desc, { "playtoon.stk", "wakan.stk", 0 } },
{ &fallbackDescs[18], { "playtoon.stk", "dan.itk" } }, { &fallbackDescs[18].desc, { "playtoon.stk", "dan.itk" } },
{ &fallbackDescs[19], { "intro.stk", "bambou.itk", 0 } }, { &fallbackDescs[19].desc, { "intro.stk", "bambou.itk", 0 } },
{ &fallbackDescs[20], { "disk0.stk", "disk1.stk", "disk2.stk", "disk3.stk", 0 } }, { &fallbackDescs[20].desc, { "disk0.stk", "disk1.stk", "disk2.stk", "disk3.stk", 0 } },
{ &fallbackDescs[21], { "disk1.stk", "disk2.stk", "disk3.stk", 0 } }, { &fallbackDescs[21].desc, { "disk1.stk", "disk2.stk", "disk3.stk", 0 } },
{ &fallbackDescs[22], { "adi2.stk", 0 } }, { &fallbackDescs[22].desc, { "adi2.stk", 0 } },
{ &fallbackDescs[23], { "adif41.stk", "adim41.stk", 0 } }, { &fallbackDescs[23].desc, { "adif41.stk", "adim41.stk", 0 } },
{ &fallbackDescs[24], { "coktelplayer.scn", 0 } }, { &fallbackDescs[24].desc, { "coktelplayer.scn", 0 } },
{ 0, { 0 } } { 0, { 0 } }
}; };

10
engines/mohawk/detection_tables.h
View file

@ -2220,11 +2220,11 @@ static const MohawkGameDescription fallbackDescs[] = {
}; };
static const ADFileBasedFallback fileBased[] = { static const ADFileBasedFallback fileBased[] = {
{ &fallbackDescs[0], { "MYST.DAT", 0 } }, { &fallbackDescs[0].desc, { "MYST.DAT", 0 } },
{ &fallbackDescs[1], { "MAKING.DAT", 0 } }, { &fallbackDescs[1].desc, { "MAKING.DAT", 0 } },
{ &fallbackDescs[2], { "MYST.DAT", "Help.dat", 0 } }, // Help system doesn't exist in original { &fallbackDescs[2].desc, { "MYST.DAT", "Help.dat", 0 } }, // Help system doesn't exist in original
{ &fallbackDescs[3], { "a_Data.MHK", 0 } }, { &fallbackDescs[3].desc, { "a_Data.MHK", 0 } },
{ &fallbackDescs[4], { "a_Data.MHK", "t_Data1.MHK" , 0 } }, { &fallbackDescs[4].desc, { "a_Data.MHK", "t_Data1.MHK" , 0 } },
{ 0, { 0 } } { 0, { 0 } }
}; };