diff --git a/configure b/configure index 6dae80f0612..85ea8c03271 100755 --- a/configure +++ b/configure @@ -6165,7 +6165,7 @@ declare -a static_detect_engines=("PLUMBERS" "AGI" "SCUMM" "SKY" "DREAMWEB" "DRA "ZVISION" "AGOS" "GOB" "COMPOSER" "DM" "DRACI" "DRAGONS" "GNAP" "GRIFFON" "GROOVIE" "HDB" "HOPKINS" "HUGO" "ILLUSIONS" "KINGDOM" "KYRA" "LAB" "LASTEXPRESS" "LILLIPUT" "MACVENTURE" "MADE" "MADS" - "MORTEVIELLE" "MUTATIONOFJB") + "MORTEVIELLE" "MUTATIONOFJB" "NEVERHOOD") detectId="_DETECTION" echo "Creating engines/plugins_table.h" diff --git a/engines/neverhood/detection.cpp b/engines/neverhood/detection.cpp index 5ed615efad4..036b3397a25 100644 --- a/engines/neverhood/detection.cpp +++ b/engines/neverhood/detection.cpp @@ -26,39 +26,7 @@ #include "common/file.h" #include "common/translation.h" -#include "neverhood/neverhood.h" - -enum NeverhoodGameFeatures { - GF_BIG_DEMO = (1 << 0) -}; - -namespace Neverhood { - -const char *NeverhoodEngine::getGameId() const { - return _gameDescription->gameId; -} - -Common::Platform NeverhoodEngine::getPlatform() const { - return _gameDescription->platform; -} - -Common::Language NeverhoodEngine::getLanguage() const { - return _gameDescription->language; -} - -bool NeverhoodEngine::isDemo() const { - return _gameDescription->flags & ADGF_DEMO; -} - -bool NeverhoodEngine::isBigDemo() const { - return _gameDescription->flags & GF_BIG_DEMO; -} - -bool NeverhoodEngine::applyResourceFixes() const { - return getLanguage() == Common::RU_RUS; -} - -} +#include "neverhood/detection.h" static const PlainGameDescriptor neverhoodGames[] = { {"neverhood", "The Neverhood Chronicles"}, @@ -180,42 +148,9 @@ public: return "The Neverhood Chronicles (C) The Neverhood, Inc."; } - bool hasFeature(MetaEngineFeature f) const override; - bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override; const ExtraGuiOptions getExtraGuiOptions(const Common::String &target) const override; - SaveStateList listSaves(const char *target) const override; - int getMaximumSaveSlot() const override; - void removeSaveState(const char *target, int slot) const override; - SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override; - }; -bool NeverhoodMetaEngine::hasFeature(MetaEngineFeature f) const { - return - (f == kSupportsListSaves) || - (f == kSupportsLoadingDuringStartup) || - (f == kSupportsDeleteSave) || - (f == kSavesSupportMetaInfo) || - (f == kSavesSupportThumbnail) || - (f == kSavesSupportCreationDate) || - (f == kSavesSupportPlayTime) || - (f == kSimpleSavesNames); -} - -bool Neverhood::NeverhoodEngine::hasFeature(EngineFeature f) const { - return - (f == kSupportsReturnToLauncher) || - (f == kSupportsLoadingDuringRuntime) || - (f == kSupportsSavingDuringRuntime); -} - -bool NeverhoodMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { - if (desc) { - *engine = new Neverhood::NeverhoodEngine(syst, desc); - } - return desc != 0; -} - const ExtraGuiOptions NeverhoodMetaEngine::getExtraGuiOptions(const Common::String &target) const { ExtraGuiOptions options; options.push_back(neverhoodExtraGuiOption1); @@ -224,79 +159,4 @@ const ExtraGuiOptions NeverhoodMetaEngine::getExtraGuiOptions(const Common::Stri return options; } -SaveStateList NeverhoodMetaEngine::listSaves(const char *target) const { - Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); - Neverhood::NeverhoodEngine::SaveHeader header; - Common::String pattern = target; - pattern += ".###"; - - Common::StringArray filenames; - filenames = saveFileMan->listSavefiles(pattern.c_str()); - - SaveStateList saveList; - for (Common::StringArray::const_iterator file = filenames.begin(); file != filenames.end(); file++) { - // Obtain the last 3 digits of the filename, since they correspond to the save slot - int slotNum = atoi(file->c_str() + file->size() - 3); - if (slotNum >= 0 && slotNum <= 999) { - Common::InSaveFile *in = saveFileMan->openForLoading(file->c_str()); - if (in) { - if (Neverhood::NeverhoodEngine::readSaveHeader(in, header) == Neverhood::NeverhoodEngine::kRSHENoError) { - saveList.push_back(SaveStateDescriptor(slotNum, header.description)); - } - delete in; - } - } - } - - // Sort saves based on slot number. - Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator()); - return saveList; -} - -int NeverhoodMetaEngine::getMaximumSaveSlot() const { - return 999; -} - -void NeverhoodMetaEngine::removeSaveState(const char *target, int slot) const { - Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); - Common::String filename = Neverhood::NeverhoodEngine::getSavegameFilename(target, slot); - saveFileMan->removeSavefile(filename.c_str()); -} - -SaveStateDescriptor NeverhoodMetaEngine::querySaveMetaInfos(const char *target, int slot) const { - Common::String filename = Neverhood::NeverhoodEngine::getSavegameFilename(target, slot); - Common::InSaveFile *in = g_system->getSavefileManager()->openForLoading(filename.c_str()); - - if (in) { - Neverhood::NeverhoodEngine::SaveHeader header; - Neverhood::NeverhoodEngine::kReadSaveHeaderError error; - - error = Neverhood::NeverhoodEngine::readSaveHeader(in, header, false); - delete in; - - if (error == Neverhood::NeverhoodEngine::kRSHENoError) { - SaveStateDescriptor desc(slot, header.description); - - desc.setDeletableFlag(false); - desc.setWriteProtectedFlag(false); - desc.setThumbnail(header.thumbnail); - int day = (header.saveDate >> 24) & 0xFF; - int month = (header.saveDate >> 16) & 0xFF; - int year = header.saveDate & 0xFFFF; - desc.setSaveDate(year, month, day); - int hour = (header.saveTime >> 16) & 0xFF; - int minutes = (header.saveTime >> 8) & 0xFF; - desc.setSaveTime(hour, minutes); - desc.setPlayTime(header.playTime * 1000); - return desc; - } - } - - return SaveStateDescriptor(); -} - -#if PLUGIN_ENABLED_DYNAMIC(NEVERHOOD) - REGISTER_PLUGIN_DYNAMIC(NEVERHOOD, PLUGIN_TYPE_ENGINE, NeverhoodMetaEngine); -#else - REGISTER_PLUGIN_STATIC(NEVERHOOD, PLUGIN_TYPE_ENGINE, NeverhoodMetaEngine); -#endif +REGISTER_PLUGIN_STATIC(NEVERHOOD_DETECTION, PLUGIN_TYPE_METAENGINE, NeverhoodMetaEngine); diff --git a/engines/neverhood/detection.h b/engines/neverhood/detection.h new file mode 100644 index 00000000000..369050894f8 --- /dev/null +++ b/engines/neverhood/detection.h @@ -0,0 +1,34 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +namespace Neverhood { + +struct NeverhoodGameDescription { + ADGameDescription desc; + + int gameID; + int gameType; + uint32 features; + uint16 version; +}; + +} // End of namespace Neverhood diff --git a/engines/neverhood/metaengine.cpp b/engines/neverhood/metaengine.cpp new file mode 100644 index 00000000000..239a1955d62 --- /dev/null +++ b/engines/neverhood/metaengine.cpp @@ -0,0 +1,180 @@ +/* ScummVM - Graphic Adventure Engine + * + * ScummVM is the legal property of its developers, whose names + * are too numerous to list here. Please refer to the COPYRIGHT + * file distributed with this source distribution. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License + * as published by the Free Software Foundation; either version 2 + * of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ + +#include "base/plugins.h" + +#include "engines/advancedDetector.h" +#include "common/file.h" +#include "common/translation.h" + +#include "neverhood/neverhood.h" +#include "neverhood/detection.h" + +enum NeverhoodGameFeatures { + GF_BIG_DEMO = (1 << 0) +}; + +namespace Neverhood { + +const char *NeverhoodEngine::getGameId() const { + return _gameDescription->gameId; +} + +Common::Platform NeverhoodEngine::getPlatform() const { + return _gameDescription->platform; +} + +Common::Language NeverhoodEngine::getLanguage() const { + return _gameDescription->language; +} + +bool NeverhoodEngine::isDemo() const { + return _gameDescription->flags & ADGF_DEMO; +} + +bool NeverhoodEngine::isBigDemo() const { + return _gameDescription->flags & GF_BIG_DEMO; +} + +bool NeverhoodEngine::applyResourceFixes() const { + return getLanguage() == Common::RU_RUS; +} + +} // End of namespace Neverhood + +class NeverhoodMetaEngineConnect : public AdvancedMetaEngineConnect { +public: + const char *getName() const override { + return "neverhood"; + } + + bool hasFeature(MetaEngineFeature f) const override; + bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override; + + SaveStateList listSaves(const char *target) const override; + int getMaximumSaveSlot() const override; + void removeSaveState(const char *target, int slot) const override; + SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override; +}; + +bool NeverhoodMetaEngineConnect::hasFeature(MetaEngineFeature f) const { + return + (f == kSupportsListSaves) || + (f == kSupportsLoadingDuringStartup) || + (f == kSupportsDeleteSave) || + (f == kSavesSupportMetaInfo) || + (f == kSavesSupportThumbnail) || + (f == kSavesSupportCreationDate) || + (f == kSavesSupportPlayTime) || + (f == kSimpleSavesNames); +} + +bool Neverhood::NeverhoodEngine::hasFeature(EngineFeature f) const { + return + (f == kSupportsReturnToLauncher) || + (f == kSupportsLoadingDuringRuntime) || + (f == kSupportsSavingDuringRuntime); +} + +bool NeverhoodMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const { + if (desc) { + *engine = new Neverhood::NeverhoodEngine(syst, desc); + } + return desc != 0; +} + +SaveStateList NeverhoodMetaEngineConnect::listSaves(const char *target) const { + Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); + Neverhood::NeverhoodEngine::SaveHeader header; + Common::String pattern = target; + pattern += ".###"; + + Common::StringArray filenames; + filenames = saveFileMan->listSavefiles(pattern.c_str()); + + SaveStateList saveList; + for (Common::StringArray::const_iterator file = filenames.begin(); file != filenames.end(); file++) { + // Obtain the last 3 digits of the filename, since they correspond to the save slot + int slotNum = atoi(file->c_str() + file->size() - 3); + if (slotNum >= 0 && slotNum <= 999) { + Common::InSaveFile *in = saveFileMan->openForLoading(file->c_str()); + if (in) { + if (Neverhood::NeverhoodEngine::readSaveHeader(in, header) == Neverhood::NeverhoodEngine::kRSHENoError) { + saveList.push_back(SaveStateDescriptor(slotNum, header.description)); + } + delete in; + } + } + } + + // Sort saves based on slot number. + Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator()); + return saveList; +} + +int NeverhoodMetaEngineConnect::getMaximumSaveSlot() const { + return 999; +} + +void NeverhoodMetaEngineConnect::removeSaveState(const char *target, int slot) const { + Common::SaveFileManager *saveFileMan = g_system->getSavefileManager(); + Common::String filename = Neverhood::NeverhoodEngine::getSavegameFilename(target, slot); + saveFileMan->removeSavefile(filename.c_str()); +} + +SaveStateDescriptor NeverhoodMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) const { + Common::String filename = Neverhood::NeverhoodEngine::getSavegameFilename(target, slot); + Common::InSaveFile *in = g_system->getSavefileManager()->openForLoading(filename.c_str()); + + if (in) { + Neverhood::NeverhoodEngine::SaveHeader header; + Neverhood::NeverhoodEngine::kReadSaveHeaderError error; + + error = Neverhood::NeverhoodEngine::readSaveHeader(in, header, false); + delete in; + + if (error == Neverhood::NeverhoodEngine::kRSHENoError) { + SaveStateDescriptor desc(slot, header.description); + + desc.setDeletableFlag(false); + desc.setWriteProtectedFlag(false); + desc.setThumbnail(header.thumbnail); + int day = (header.saveDate >> 24) & 0xFF; + int month = (header.saveDate >> 16) & 0xFF; + int year = header.saveDate & 0xFFFF; + desc.setSaveDate(year, month, day); + int hour = (header.saveTime >> 16) & 0xFF; + int minutes = (header.saveTime >> 8) & 0xFF; + desc.setSaveTime(hour, minutes); + desc.setPlayTime(header.playTime * 1000); + return desc; + } + } + + return SaveStateDescriptor(); +} + +#if PLUGIN_ENABLED_DYNAMIC(NEVERHOOD) + REGISTER_PLUGIN_DYNAMIC(NEVERHOOD, PLUGIN_TYPE_ENGINE, NeverhoodMetaEngineConnect); +#else + REGISTER_PLUGIN_STATIC(NEVERHOOD, PLUGIN_TYPE_ENGINE, NeverhoodMetaEngineConnect); +#endif diff --git a/engines/neverhood/module.mk b/engines/neverhood/module.mk index 9c1220134c2..2ffef0c3bb1 100644 --- a/engines/neverhood/module.mk +++ b/engines/neverhood/module.mk @@ -4,7 +4,6 @@ MODULE_OBJS = \ background.o \ blbarchive.o \ console.o \ - detection.o \ diskplayerscene.o \ entity.o \ gamemodule.o \ @@ -12,6 +11,7 @@ MODULE_OBJS = \ graphics.o \ klaymen.o \ menumodule.o \ + metaengine.o \ microtiles.o \ module.o \ modules/module1000.o \ @@ -75,3 +75,6 @@ endif # Include common rules include $(srcdir)/rules.mk + +# Detection objects +DETECT_OBJS += $(MODULE)/detection.o