TINSEL: Remove some unused code; and duplicated the 4-FLAGS version detection entry (one copy for each language) for the user's convenience

svn-id: r34213
This commit is contained in:
Max Horn 2008-08-30 22:09:35 +00:00
parent be85bf25a5
commit aa463878a3

View File

@ -144,9 +144,75 @@ static const TinselGameDescription gameDescriptions[] = {
{"spanish.txt", 0, NULL, -1},
{NULL, 0, NULL, 0}
},
Common::UNK_LANG,
Common::FR_FRA,
Common::kPlatformPC,
Common::ADGF_NO_FLAGS
Common::ADGF_DROPLANGUAGE
},
GID_DW1,
0,
GF_CD | GF_USE_4FLAGS,
TINSEL_V1,
},
{
{
"dw",
"CD",
{
{"dw.gra", 0, "c8808ccd988d603dd35dff42013ae7fd", 781656},
{"english.smp", 0, NULL, -1},
{"french.txt", 0, NULL, -1},
{"german.txt", 0, NULL, -1},
{"italian.txt", 0, NULL, -1},
{"spanish.txt", 0, NULL, -1},
{NULL, 0, NULL, 0}
},
Common::DE_DEU,
Common::kPlatformPC,
Common::ADGF_DROPLANGUAGE
},
GID_DW1,
0,
GF_CD | GF_USE_4FLAGS,
TINSEL_V1,
},
{
{
"dw",
"CD",
{
{"dw.gra", 0, "c8808ccd988d603dd35dff42013ae7fd", 781656},
{"english.smp", 0, NULL, -1},
{"french.txt", 0, NULL, -1},
{"german.txt", 0, NULL, -1},
{"italian.txt", 0, NULL, -1},
{"spanish.txt", 0, NULL, -1},
{NULL, 0, NULL, 0}
},
Common::IT_ITA,
Common::kPlatformPC,
Common::ADGF_DROPLANGUAGE
},
GID_DW1,
0,
GF_CD | GF_USE_4FLAGS,
TINSEL_V1,
},
{
{
"dw",
"CD",
{
{"dw.gra", 0, "c8808ccd988d603dd35dff42013ae7fd", 781656},
{"english.smp", 0, NULL, -1},
{"french.txt", 0, NULL, -1},
{"german.txt", 0, NULL, -1},
{"italian.txt", 0, NULL, -1},
{"spanish.txt", 0, NULL, -1},
{NULL, 0, NULL, 0}
},
Common::ES_ESP,
Common::kPlatformPC,
Common::ADGF_DROPLANGUAGE
},
GID_DW1,
0,
@ -213,25 +279,6 @@ static const TinselGameDescription gameDescriptions[] = {
{ AD_TABLE_END_MARKER, 0, 0, 0, 0 }
};
/**
* The fallback game descriptor used by the Tinsel engine's fallbackDetector.
* Contents of this struct are to be overwritten by the fallbackDetector.
*/
static TinselGameDescription g_fallbackDesc = {
{
"",
"",
AD_ENTRY1(0, 0), // This should always be AD_ENTRY1(0, 0) in the fallback descriptor
Common::UNK_LANG,
Common::kPlatformPC,
Common::ADGF_NO_FLAGS
},
0,
0,
0,
0,
};
} // End of namespace Tinsel
static const Common::ADParams detectionParams = {
@ -267,8 +314,6 @@ public:
virtual bool createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const;
const Common::ADGameDescription *fallbackDetect(const FSList *fslist) const;
};
bool TinselMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const {
@ -279,21 +324,6 @@ bool TinselMetaEngine::createInstance(OSystem *syst, Engine **engine, const Comm
return gd != 0;
}
const Common::ADGameDescription *TinselMetaEngine::fallbackDetect(const FSList *fslist) const {
// Set the default values for the fallback descriptor's ADGameDescription part.
Tinsel::g_fallbackDesc.desc.language = Common::UNK_LANG;
Tinsel::g_fallbackDesc.desc.platform = Common::kPlatformPC;
Tinsel::g_fallbackDesc.desc.flags = Common::ADGF_NO_FLAGS;
// Set default values for the fallback descriptor's TinselGameDescription part.
Tinsel::g_fallbackDesc.gameID = 0;
Tinsel::g_fallbackDesc.features = 0;
Tinsel::g_fallbackDesc.version = 0;
//return (const Common::ADGameDescription *)&Tinsel::g_fallbackDesc;
return NULL;
}
#if PLUGIN_ENABLED_DYNAMIC(TINSEL)
REGISTER_PLUGIN_DYNAMIC(TINSEL, PLUGIN_TYPE_ENGINE, TinselMetaEngine);
#else