libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-01 08:23:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Proper detection for packed German and French versions. Removed unneeded code.

Browse Source 
svn-id: r32489
This commit is contained in:
Eugene Sandulenko 2008-06-02 05:56:53 +00:00
parent 4352bd1d88
commit aaf8b5810c
3 changed files with 15 additions and 94 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

96
engines/drascula/detection.cpp
View File

@ -36,28 +36,13 @@ namespace Drascula {
struct DrasculaGameDescription {
Common::ADGameDescription desc;
int gameID;
int gameType;
uint32 features;
uint16 version;
};
uint32 DrasculaEngine::getGameID() const {
return _gameDescription->gameID;
}
uint32 DrasculaEngine::getFeatures() const {
return _gameDescription->features;
}
Common::Platform DrasculaEngine::getPlatform() const {
return _gameDescription->desc.platform;
}
uint16 DrasculaEngine::getVersion() const {
return _gameDescription->version;
}
Common::Language DrasculaEngine::getLanguage() const {
return _gameDescription->desc.language;
}
@ -85,9 +70,6 @@ static const DrasculaGameDescription gameDescriptions[] = {
Common::ADGF_NO_FLAGS
},
0,
0,
0,
0,
},
{
@ -100,10 +82,7 @@ static const DrasculaGameDescription gameDescriptions[] = {
Common::kPlatformPC,
Common::ADGF_NO_FLAGS
},
0,
0,
0,
0,
GF_PACKED,
},
{
@ -111,15 +90,16 @@ static const DrasculaGameDescription gameDescriptions[] = {
{
"drascula",
0,
AD_ENTRY1s("packet.003", "e8f4dc6091037329bab4ddb1cba35807", 719728),
{
{"packet.001", 0, "c6a8697396e213a18472542d5f547cb4", 32847563},
{"packet.003", 0, "e8f4dc6091037329bab4ddb1cba35807", 719728},
{NULL, 0, NULL, 0}
},
Common::DE_DEU,
Common::kPlatformPC,
Common::ADGF_NO_FLAGS
},
0,
0,
0,
0,
GF_PACKED,
},
{
@ -127,15 +107,16 @@ static const DrasculaGameDescription gameDescriptions[] = {
{
"drascula",
0,
AD_ENTRY1s("packet.002", "4401123400f22f212b89f15fb4b43013", 721122),
{
{"packet.001", 0, "c6a8697396e213a18472542d5f547cb4", 32847563},
{"packet.003", 0, "4401123400f22f212b89f15fb4b43013", 721122},
{NULL, 0, NULL, 0}
},
Common::FR_FRA,
Common::kPlatformPC,
Common::ADGF_NO_FLAGS
},
0,
0,
0,
0,
GF_PACKED,
},
{
@ -149,9 +130,6 @@ static const DrasculaGameDescription gameDescriptions[] = {
Common::ADGF_NO_FLAGS
},
0,
0,
0,
0,
},
{
@ -165,9 +143,6 @@ static const DrasculaGameDescription gameDescriptions[] = {
Common::ADGF_NO_FLAGS
},
0,
0,
0,
0,
},
{
@ -181,9 +156,6 @@ static const DrasculaGameDescription gameDescriptions[] = {
Common::ADGF_NO_FLAGS
},
0,
0,
0,
0,
},
{
@ -197,31 +169,9 @@ static const DrasculaGameDescription gameDescriptions[] = {
Common::ADGF_NO_FLAGS
},
0,
0,
0,
0,
},
{ AD_TABLE_END_MARKER, 0, 0, 0, 0 }
};
/**
* The fallback game descriptor used by the Drascula engine's fallbackDetector.
* Contents of this struct are to be overwritten by the fallbackDetector.
*/
static DrasculaGameDescription 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,
{ AD_TABLE_END_MARKER, 0, }
};
} // End of namespace Drascula
@ -258,9 +208,6 @@ public:
}
virtual bool createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const;
const Common::ADGameDescription *fallbackDetect(const FSList *fslist) const;
};
bool DrasculaMetaEngine::createInstance(OSystem *syst, Engine **engine, const Common::ADGameDescription *desc) const {
@ -271,21 +218,6 @@ bool DrasculaMetaEngine::createInstance(OSystem *syst, Engine **engine, const Co
return gd != 0;
}
const Common::ADGameDescription *DrasculaMetaEngine::fallbackDetect(const FSList *fslist) const {
// Set the default values for the fallback descriptor's ADGameDescription part.
Drascula::g_fallbackDesc.desc.language = Common::UNK_LANG;
Drascula::g_fallbackDesc.desc.platform = Common::kPlatformPC;
Drascula::g_fallbackDesc.desc.flags = Common::ADGF_NO_FLAGS;
// Set default values for the fallback descriptor's DrasculaGameDescription part.
Drascula::g_fallbackDesc.gameID = 0;
Drascula::g_fallbackDesc.features = 0;
Drascula::g_fallbackDesc.version = 0;
//return (const Common::ADGameDescription *)&Drascula::g_fallbackDesc;
return NULL;
}
#if PLUGIN_ENABLED_DYNAMIC(DRASCULA)
REGISTER_PLUGIN_DYNAMIC(DRASCULA, PLUGIN_TYPE_ENGINE, DrasculaMetaEngine);
#else

5
engines/drascula/drascula.cpp
View File

@ -60,11 +60,6 @@ DrasculaEngine::DrasculaEngine(OSystem *syst, const DrasculaGameDescription *gam
const GameSettings *g;
const char *gameid = ConfMan.get("gameid").c_str();
for (g = drasculaSettings; g->gameid; ++g)
if (!scumm_stricmp(g->gameid, gameid))
_gameId = g->id;
_rnd = new Common::RandomSource();
syst->getEventManager()->registerRandomSource(*_rnd, "drascula");

8
engines/drascula/drascula.h
View File

@ -47,6 +47,7 @@
namespace Drascula {
enum DrasculaGameFeatures {
GF_PACKED = (1 << 0)
};
enum Languages {
@ -144,7 +145,6 @@ static const int interf_x[] ={ 1, 65, 129, 193, 1, 65, 129 };
static const int interf_y[] ={ 51, 51, 51, 51, 83, 83, 83 };
class DrasculaEngine : public ::Engine {
int _gameId;
Common::KeyState _keyPressed;
protected:
@ -155,16 +155,10 @@ protected:
public:
DrasculaEngine(OSystem *syst, const DrasculaGameDescription *gameDesc);
virtual ~DrasculaEngine();
int getGameId() {
return _gameId;
}
Common::RandomSource *_rnd;
const DrasculaGameDescription *_gameDescription;
uint32 getGameID() const;
uint32 getFeatures() const;
uint16 getVersion() const;
Common::Platform getPlatform() const;
Common::Language getLanguage() const;
void updateEvents();