WAGE: Split detection features & adapt to new plugins.

This commit is contained in:
aryanrawlani28 2020-08-06 23:36:31 +05:30 committed by Eugene Sandulenko
parent 52cdf07671
commit 46f1ba1f1f
4 changed files with 145 additions and 106 deletions

2
configure vendored
View File

@ -6168,7 +6168,7 @@ declare -a static_detect_engines=("PLUMBERS" "AGI" "SCUMM" "SKY" "DREAMWEB" "DRA
"MORTEVIELLE" "MUTATIONOFJB" "NEVERHOOD" "PARALLACTION" "PEGASUS"
"PETKA" "PINK" "PRINCE" "SHERLOCK" "SLUDGE" "STARTREK" "SUPERNOVA"
"TEENAGENT" "TESTBED" "TINSEL" "TITANIC" "TOLTECS" "TONY" "TOON"
"TOUCHE" "TSAGE" "TUCKER" "VOYEUR")
"TOUCHE" "TSAGE" "TUCKER" "VOYEUR" "WAGE")
detectId="_DETECTION"
echo "Creating engines/plugins_table.h"

View File

@ -24,18 +24,6 @@
#include "base/plugins.h"
#include "engines/advancedDetector.h"
#include "common/system.h"
#include "common/savefile.h"
#include "wage/wage.h"
namespace Wage {
const char *WageEngine::getGameFile() const {
return _gameDescription->filesDescriptions[0].fileName;
}
}
static const PlainGameDescriptor wageGames[] = {
{"afm", "Another Fine Mess"},
@ -69,97 +57,6 @@ public:
const char *getOriginalCopyright() const override {
return "World Builder (C) Silicon Beach Software";
}
bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
bool hasFeature(MetaEngineFeature f) const override;
SaveStateList listSaves(const char *target) const override;
int getMaximumSaveSlot() const override;
void removeSaveState(const char *target, int slot) const override;
};
bool WageMetaEngine::hasFeature(MetaEngineFeature f) const {
return
(f == kSupportsListSaves) ||
(f == kSupportsLoadingDuringStartup) ||
(f == kSupportsDeleteSave) ||
(f == kSimpleSavesNames);
}
bool Wage::WageEngine::hasFeature(EngineFeature f) const {
return
(f == kSupportsReturnToLauncher) ||
(f == kSupportsLoadingDuringRuntime) ||
(f == kSupportsSavingDuringRuntime);
}
bool WageMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
if (desc) {
*engine = new Wage::WageEngine(syst, desc);
}
return desc != 0;
}
SaveStateList WageMetaEngine::listSaves(const char *target) const {
const uint32 WAGEflag = MKTAG('W','A','G','E');
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
Common::StringArray filenames;
char saveDesc[128] = {0};
Common::String pattern = target;
pattern += ".###";
filenames = saveFileMan->listSavefiles(pattern);
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);
if (in) {
saveDesc[0] = 0;
in->seek(in->size() - 8);
uint32 offset = in->readUint32BE();
uint32 type = in->readUint32BE();
if (type == WAGEflag) {
in->seek(offset);
type = in->readUint32BE();
if (type == WAGEflag) {
in->read(saveDesc, 127);
}
}
saveList.push_back(SaveStateDescriptor(slotNum, saveDesc));
delete in;
}
}
}
// Sort saves based on slot number.
Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
return saveList;
}
int WageMetaEngine::getMaximumSaveSlot() const { return 999; }
void WageMetaEngine::removeSaveState(const char *target, int slot) const {
g_system->getSavefileManager()->removeSavefile(Common::String::format("%s.%03d", target, slot));
}
#if PLUGIN_ENABLED_DYNAMIC(WAGE)
REGISTER_PLUGIN_DYNAMIC(WAGE, PLUGIN_TYPE_ENGINE, WageMetaEngine);
#else
REGISTER_PLUGIN_STATIC(WAGE, PLUGIN_TYPE_ENGINE, WageMetaEngine);
#endif
namespace Wage {
bool WageEngine::canLoadGameStateCurrently() {
return true;
}
bool WageEngine::canSaveGameStateCurrently() {
return true;
}
} // End of namespace Wage
REGISTER_PLUGIN_STATIC(WAGE_DETECTION, PLUGIN_TYPE_METAENGINE, WageMetaEngine);

139
engines/wage/metaengine.cpp Normal file
View File

@ -0,0 +1,139 @@
/* 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 "common/system.h"
#include "common/savefile.h"
#include "engines/advancedDetector.h"
#include "wage/wage.h"
namespace Wage {
const char *WageEngine::getGameFile() const {
return _gameDescription->filesDescriptions[0].fileName;
}
} // End of namespace Wage
class WageMetaEngineConnect : public AdvancedMetaEngineConnect {
public:
const char *getName() const override {
return "wage";
}
bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
bool hasFeature(MetaEngineFeature f) const override;
SaveStateList listSaves(const char *target) const override;
int getMaximumSaveSlot() const override;
void removeSaveState(const char *target, int slot) const override;
};
bool WageMetaEngineConnect::hasFeature(MetaEngineFeature f) const {
return
(f == kSupportsListSaves) ||
(f == kSupportsLoadingDuringStartup) ||
(f == kSupportsDeleteSave) ||
(f == kSimpleSavesNames);
}
bool Wage::WageEngine::hasFeature(EngineFeature f) const {
return
(f == kSupportsReturnToLauncher) ||
(f == kSupportsLoadingDuringRuntime) ||
(f == kSupportsSavingDuringRuntime);
}
bool WageMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
if (desc) {
*engine = new Wage::WageEngine(syst, desc);
}
return desc != 0;
}
SaveStateList WageMetaEngineConnect::listSaves(const char *target) const {
const uint32 WAGEflag = MKTAG('W','A','G','E');
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
Common::StringArray filenames;
char saveDesc[128] = {0};
Common::String pattern = target;
pattern += ".###";
filenames = saveFileMan->listSavefiles(pattern);
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);
if (in) {
saveDesc[0] = 0;
in->seek(in->size() - 8);
uint32 offset = in->readUint32BE();
uint32 type = in->readUint32BE();
if (type == WAGEflag) {
in->seek(offset);
type = in->readUint32BE();
if (type == WAGEflag) {
in->read(saveDesc, 127);
}
}
saveList.push_back(SaveStateDescriptor(slotNum, saveDesc));
delete in;
}
}
}
// Sort saves based on slot number.
Common::sort(saveList.begin(), saveList.end(), SaveStateDescriptorSlotComparator());
return saveList;
}
int WageMetaEngineConnect::getMaximumSaveSlot() const { return 999; }
void WageMetaEngineConnect::removeSaveState(const char *target, int slot) const {
g_system->getSavefileManager()->removeSavefile(Common::String::format("%s.%03d", target, slot));
}
#if PLUGIN_ENABLED_DYNAMIC(WAGE)
REGISTER_PLUGIN_DYNAMIC(WAGE, PLUGIN_TYPE_ENGINE, WageMetaEngineConnect);
#else
REGISTER_PLUGIN_STATIC(WAGE, PLUGIN_TYPE_ENGINE, WageMetaEngineConnect);
#endif
namespace Wage {
bool WageEngine::canLoadGameStateCurrently() {
return true;
}
bool WageEngine::canSaveGameStateCurrently() {
return true;
}
} // End of namespace Wage

View File

@ -4,10 +4,10 @@ MODULE_OBJS := \
combat.o \
debugger.o \
design.o \
detection.o \
dialog.o \
entities.o \
gui.o \
metaengine.o \
randomhat.o \
saveload.o \
script.o \
@ -26,3 +26,6 @@ endif
# Include common rules
include $(srcdir)/rules.mk
# Detection objects
DETECT_OBJS += $(MODULE)/detection.o