ADL: Split detection code & adapt to new plugins.
This commit is contained in:
aryanrawlani28
Eugene Sandulenko
parent
0880ab9357
commit
c2428c7a8f
6 changed files with 238 additions and 187 deletions
|
|
@ -20,15 +20,11 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include "common/system.h"
|
||||
#include "common/savefile.h"
|
||||
#include "common/translation.h"
|
||||
#include "common/file.h"
|
||||
#include "common/md5.h"
|
||||
#include "common/debug.h"
|
||||
|
||||
#include "graphics/thumbnail.h"
|
||||
|
||||
#include "engines/advancedDetector.h"
|
||||
|
||||
#include "adl/detection.h"
|
||||
|
|
@ -112,12 +108,6 @@ static const PlainGameDescriptor adlGames[] = {
|
|||
{ 0, 0 }
|
||||
};
|
||||
|
||||
struct AdlGameDescription {
|
||||
ADGameDescription desc;
|
||||
GameType gameType;
|
||||
GameVersion version;
|
||||
};
|
||||
|
||||
static const AdlGameDescription gameFileDescriptions[] = {
|
||||
{ // Hi-Res Adventure #1: Mystery House - Apple II - Contains Simi Valley address
|
||||
{
|
||||
|
|
@ -376,137 +366,11 @@ public:
|
|||
return "Copyright (C) Sierra On-Line";
|
||||
}
|
||||
|
||||
bool hasFeature(MetaEngineFeature f) const override;
|
||||
SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override;
|
||||
int getMaximumSaveSlot() const override { return 'O' - 'A'; }
|
||||
SaveStateList listSaves(const char *target) const override;
|
||||
void removeSaveState(const char *target, int slot) const override;
|
||||
ADDetectedGames detectGame(const Common::FSNode &parent, const FileMap &allFiles, Common::Language language, Common::Platform platform, const Common::String &extra) const override;
|
||||
|
||||
bool addFileProps(const FileMap &allFiles, Common::String fname, FilePropertiesMap &filePropsMap) const;
|
||||
|
||||
bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const override;
|
||||
};
|
||||
|
||||
bool AdlMetaEngine::hasFeature(MetaEngineFeature f) const {
|
||||
switch(f) {
|
||||
case kSupportsListSaves:
|
||||
case kSupportsLoadingDuringStartup:
|
||||
case kSupportsDeleteSave:
|
||||
case kSavesSupportMetaInfo:
|
||||
case kSavesSupportThumbnail:
|
||||
case kSavesSupportCreationDate:
|
||||
case kSavesSupportPlayTime:
|
||||
case kSimpleSavesNames:
|
||||
return true;
|
||||
default:
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
SaveStateDescriptor AdlMetaEngine::querySaveMetaInfos(const char *target, int slot) const {
|
||||
Common::String fileName = Common::String::format("%s.s%02d", target, slot);
|
||||
Common::InSaveFile *inFile = g_system->getSavefileManager()->openForLoading(fileName);
|
||||
|
||||
if (!inFile)
|
||||
return SaveStateDescriptor();
|
||||
|
||||
if (inFile->readUint32BE() != MKTAG('A', 'D', 'L', ':')) {
|
||||
delete inFile;
|
||||
return SaveStateDescriptor();
|
||||
}
|
||||
|
||||
byte saveVersion = inFile->readByte();
|
||||
if (saveVersion != SAVEGAME_VERSION) {
|
||||
delete inFile;
|
||||
return SaveStateDescriptor();
|
||||
}
|
||||
|
||||
char name[SAVEGAME_NAME_LEN] = { };
|
||||
inFile->read(name, sizeof(name) - 1);
|
||||
inFile->readByte();
|
||||
|
||||
if (inFile->eos() || inFile->err()) {
|
||||
delete inFile;
|
||||
return SaveStateDescriptor();
|
||||
}
|
||||
|
||||
SaveStateDescriptor sd(slot, name);
|
||||
|
||||
int year = inFile->readUint16BE();
|
||||
int month = inFile->readByte();
|
||||
int day = inFile->readByte();
|
||||
sd.setSaveDate(year + 1900, month + 1, day);
|
||||
|
||||
int hour = inFile->readByte();
|
||||
int minutes = inFile->readByte();
|
||||
sd.setSaveTime(hour, minutes);
|
||||
|
||||
uint32 playTime = inFile->readUint32BE();
|
||||
sd.setPlayTime(playTime);
|
||||
|
||||
if (inFile->eos() || inFile->err()) {
|
||||
delete inFile;
|
||||
return SaveStateDescriptor();
|
||||
}
|
||||
|
||||
Graphics::Surface *thumbnail;
|
||||
if (!Graphics::loadThumbnail(*inFile, thumbnail)) {
|
||||
delete inFile;
|
||||
return SaveStateDescriptor();
|
||||
}
|
||||
sd.setThumbnail(thumbnail);
|
||||
|
||||
delete inFile;
|
||||
return sd;
|
||||
}
|
||||
|
||||
SaveStateList AdlMetaEngine::listSaves(const char *target) const {
|
||||
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
|
||||
Common::StringArray files = saveFileMan->listSavefiles(Common::String(target) + ".s##");
|
||||
|
||||
SaveStateList saveList;
|
||||
|
||||
for (uint i = 0; i < files.size(); ++i) {
|
||||
const Common::String &fileName = files[i];
|
||||
Common::InSaveFile *inFile = saveFileMan->openForLoading(fileName);
|
||||
if (!inFile) {
|
||||
warning("Cannot open save file '%s'", fileName.c_str());
|
||||
continue;
|
||||
}
|
||||
|
||||
if (inFile->readUint32BE() != MKTAG('A', 'D', 'L', ':')) {
|
||||
warning("No header found in '%s'", fileName.c_str());
|
||||
delete inFile;
|
||||
continue;
|
||||
}
|
||||
|
||||
byte saveVersion = inFile->readByte();
|
||||
if (saveVersion != SAVEGAME_VERSION) {
|
||||
warning("Unsupported save game version %i found in '%s'", saveVersion, fileName.c_str());
|
||||
delete inFile;
|
||||
continue;
|
||||
}
|
||||
|
||||
char name[SAVEGAME_NAME_LEN] = { };
|
||||
inFile->read(name, sizeof(name) - 1);
|
||||
delete inFile;
|
||||
|
||||
int slotNum = atoi(fileName.c_str() + fileName.size() - 2);
|
||||
SaveStateDescriptor sd(slotNum, name);
|
||||
saveList.push_back(sd);
|
||||
}
|
||||
|
||||
// Sort saves based on slot number.
|
||||
Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
|
||||
return saveList;
|
||||
}
|
||||
|
||||
void AdlMetaEngine::removeSaveState(const char *target, int slot) const {
|
||||
Common::String fileName = Common::String::format("%s.s%02d", target, slot);
|
||||
g_system->getSavefileManager()->removeSavefile(fileName);
|
||||
}
|
||||
|
||||
Common::String getDiskImageName(const AdlGameDescription &adlDesc, byte volume) {
|
||||
const ADGameDescription &desc = adlDesc.desc;
|
||||
for (uint i = 0; desc.filesDescriptions[i].fileName; ++i) {
|
||||
|
|
@ -655,53 +519,6 @@ ADDetectedGames AdlMetaEngine::detectGame(const Common::FSNode &parent, const Fi
|
|||
return matched;
|
||||
}
|
||||
|
||||
Engine *HiRes1Engine_create(OSystem *syst, const AdlGameDescription *gd);
|
||||
Engine *HiRes2Engine_create(OSystem *syst, const AdlGameDescription *gd);
|
||||
Engine *HiRes0Engine_create(OSystem *syst, const AdlGameDescription *gd);
|
||||
Engine *HiRes3Engine_create(OSystem *syst, const AdlGameDescription *gd);
|
||||
Engine *HiRes4Engine_create(OSystem *syst, const AdlGameDescription *gd);
|
||||
Engine *HiRes5Engine_create(OSystem *syst, const AdlGameDescription *gd);
|
||||
Engine *HiRes6Engine_create(OSystem *syst, const AdlGameDescription *gd);
|
||||
|
||||
bool AdlMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const {
|
||||
if (!gd)
|
||||
return false;
|
||||
|
||||
const AdlGameDescription *adlGd = (const AdlGameDescription *)gd;
|
||||
|
||||
switch (adlGd->gameType) {
|
||||
case GAME_TYPE_HIRES1:
|
||||
*engine = HiRes1Engine_create(syst, adlGd);
|
||||
break;
|
||||
case GAME_TYPE_HIRES2:
|
||||
*engine = HiRes2Engine_create(syst, adlGd);
|
||||
break;
|
||||
case GAME_TYPE_HIRES0:
|
||||
*engine = HiRes0Engine_create(syst, adlGd);
|
||||
break;
|
||||
case GAME_TYPE_HIRES3:
|
||||
*engine = HiRes3Engine_create(syst, adlGd);
|
||||
break;
|
||||
case GAME_TYPE_HIRES4:
|
||||
*engine = HiRes4Engine_create(syst, adlGd);
|
||||
break;
|
||||
case GAME_TYPE_HIRES5:
|
||||
*engine = HiRes5Engine_create(syst, adlGd);
|
||||
break;
|
||||
case GAME_TYPE_HIRES6:
|
||||
*engine = HiRes6Engine_create(syst, adlGd);
|
||||
break;
|
||||
default:
|
||||
error("Unknown GameType");
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
} // End of namespace Adl
|
||||
|
||||
#if PLUGIN_ENABLED_DYNAMIC(ADL)
|
||||
REGISTER_PLUGIN_DYNAMIC(ADL, PLUGIN_TYPE_ENGINE, Adl::AdlMetaEngine);
|
||||
#else
|
||||
REGISTER_PLUGIN_STATIC(ADL, PLUGIN_TYPE_ENGINE, Adl::AdlMetaEngine);
|
||||
#endif
|
||||
REGISTER_PLUGIN_STATIC(ADL_DETECTION, PLUGIN_TYPE_METAENGINE, Adl::AdlMetaEngine);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue