BBVS: Split detection features & adapt to new plugins.
This commit is contained in:
aryanrawlani28
Eugene Sandulenko
parent
9208a65a1f
commit
c4ba47a65d
6 changed files with 168 additions and 100 deletions
2
configure
vendored
2
configure
vendored
|
|
@ -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" "WAGE" "AVALANCHE")
|
||||
"TOUCHE" "TSAGE" "TUCKER" "VOYEUR" "WAGE" "AVALANCHE" "BBVS")
|
||||
detectId="_DETECTION"
|
||||
|
||||
echo "Creating engines/plugins_table.h"
|
||||
|
|
|
|||
|
|
@ -24,6 +24,7 @@
|
|||
#define BBVS_BBVS_H
|
||||
|
||||
#include "audio/mixer.h"
|
||||
|
||||
#include "common/array.h"
|
||||
#include "common/events.h"
|
||||
#include "common/file.h"
|
||||
|
|
@ -32,8 +33,11 @@
|
|||
#include "common/str.h"
|
||||
#include "common/substream.h"
|
||||
#include "common/system.h"
|
||||
|
||||
#include "engines/engine.h"
|
||||
|
||||
#include "bbvs/detection_enums.h"
|
||||
|
||||
struct ADGameDescription;
|
||||
|
||||
namespace Bbvs {
|
||||
|
|
@ -59,10 +63,6 @@ class SoundMan;
|
|||
|
||||
#define BBVS_SAVEGAME_VERSION 0
|
||||
|
||||
enum {
|
||||
GF_GUILANGSWITCH = (1 << 0) // If GUI language switch is required for menus
|
||||
};
|
||||
|
||||
enum {
|
||||
kVerbLook = 0,
|
||||
kVerbUse = 1,
|
||||
|
|
|
|||
|
|
@ -20,14 +20,10 @@
|
|||
*
|
||||
*/
|
||||
|
||||
#include "bbvs/bbvs.h"
|
||||
|
||||
#include "common/config-manager.h"
|
||||
#include "engines/advancedDetector.h"
|
||||
#include "common/savefile.h"
|
||||
#include "common/system.h"
|
||||
#include "base/plugins.h"
|
||||
#include "graphics/thumbnail.h"
|
||||
|
||||
#include "bbvs/detection_enums.h"
|
||||
|
||||
static const PlainGameDescriptor bbvsGames[] = {
|
||||
{ "bbvs", "Beavis and Butt-head in Virtual Stupidity" },
|
||||
|
|
@ -113,93 +109,6 @@ public:
|
|||
const char *getOriginalCopyright() const override {
|
||||
return "(C) 1995 Viacom New Media";
|
||||
}
|
||||
|
||||
bool hasFeature(MetaEngineFeature f) const override;
|
||||
bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
|
||||
int getMaximumSaveSlot() const override;
|
||||
SaveStateList listSaves(const char *target) const override;
|
||||
SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override;
|
||||
void removeSaveState(const char *target, int slot) const override;
|
||||
};
|
||||
|
||||
bool BbvsMetaEngine::hasFeature(MetaEngineFeature f) const {
|
||||
return
|
||||
(f == kSupportsListSaves) ||
|
||||
(f == kSupportsDeleteSave) ||
|
||||
(f == kSupportsLoadingDuringStartup) ||
|
||||
(f == kSavesSupportMetaInfo) ||
|
||||
(f == kSavesSupportThumbnail) ||
|
||||
(f == kSavesSupportCreationDate) ||
|
||||
(f == kSimpleSavesNames);
|
||||
}
|
||||
|
||||
void BbvsMetaEngine::removeSaveState(const char *target, int slot) const {
|
||||
Common::String fileName = Common::String::format("%s.%03d", target, slot);
|
||||
g_system->getSavefileManager()->removeSavefile(fileName);
|
||||
}
|
||||
|
||||
int BbvsMetaEngine::getMaximumSaveSlot() const {
|
||||
return 999;
|
||||
}
|
||||
|
||||
SaveStateList BbvsMetaEngine::listSaves(const char *target) const {
|
||||
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
|
||||
Bbvs::BbvsEngine::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 (Bbvs::BbvsEngine::readSaveHeader(in, header) == Bbvs::BbvsEngine::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;
|
||||
}
|
||||
|
||||
SaveStateDescriptor BbvsMetaEngine::querySaveMetaInfos(const char *target, int slot) const {
|
||||
Common::String filename = Bbvs::BbvsEngine::getSavegameFilename(target, slot);
|
||||
Common::InSaveFile *in = g_system->getSavefileManager()->openForLoading(filename.c_str());
|
||||
if (in) {
|
||||
Bbvs::BbvsEngine::SaveHeader header;
|
||||
Bbvs::BbvsEngine::kReadSaveHeaderError error;
|
||||
error = Bbvs::BbvsEngine::readSaveHeader(in, header, false);
|
||||
delete in;
|
||||
if (error == Bbvs::BbvsEngine::kRSHENoError) {
|
||||
SaveStateDescriptor desc(slot, header.description);
|
||||
// Slot 0 is used for the "Continue" save
|
||||
desc.setDeletableFlag(slot != 0);
|
||||
desc.setWriteProtectedFlag(slot == 0);
|
||||
desc.setThumbnail(header.thumbnail);
|
||||
desc.setSaveDate(header.saveDate & 0xFFFF, (header.saveDate >> 16) & 0xFF, (header.saveDate >> 24) & 0xFF);
|
||||
desc.setSaveTime((header.saveTime >> 16) & 0xFF, (header.saveTime >> 8) & 0xFF);
|
||||
desc.setPlayTime(header.playTime * 1000);
|
||||
return desc;
|
||||
}
|
||||
}
|
||||
return SaveStateDescriptor();
|
||||
}
|
||||
|
||||
bool BbvsMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
|
||||
if (desc) {
|
||||
*engine = new Bbvs::BbvsEngine(syst, desc);
|
||||
}
|
||||
return desc != 0;
|
||||
}
|
||||
|
||||
#if PLUGIN_ENABLED_DYNAMIC(BBVS)
|
||||
REGISTER_PLUGIN_DYNAMIC(BBVS, PLUGIN_TYPE_ENGINE, BbvsMetaEngine);
|
||||
#else
|
||||
REGISTER_PLUGIN_STATIC(BBVS, PLUGIN_TYPE_ENGINE, BbvsMetaEngine);
|
||||
#endif
|
||||
REGISTER_PLUGIN_STATIC(BBVS_DETECTION, PLUGIN_TYPE_METAENGINE, BbvsMetaEngine);
|
||||
|
|
|
|||
29
engines/bbvs/detection_enums.h
Normal file
29
engines/bbvs/detection_enums.h
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
/* 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 Bbvs {
|
||||
|
||||
enum {
|
||||
GF_GUILANGSWITCH = (1 << 0) // If GUI language switch is required for menus
|
||||
};
|
||||
|
||||
} // End of namespace Bbvs
|
||||
127
engines/bbvs/metaengine.cpp
Normal file
127
engines/bbvs/metaengine.cpp
Normal file
|
|
@ -0,0 +1,127 @@
|
|||
/* 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 "bbvs/bbvs.h"
|
||||
|
||||
#include "common/config-manager.h"
|
||||
#include "engines/advancedDetector.h"
|
||||
#include "common/savefile.h"
|
||||
#include "common/system.h"
|
||||
#include "base/plugins.h"
|
||||
#include "graphics/thumbnail.h"
|
||||
|
||||
class BbvsMetaEngineConnect : public AdvancedMetaEngineConnect {
|
||||
public:
|
||||
const char *getName() const override {
|
||||
return "bbvs";
|
||||
}
|
||||
|
||||
bool hasFeature(MetaEngineFeature f) const override;
|
||||
bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
|
||||
|
||||
int getMaximumSaveSlot() const override;
|
||||
SaveStateList listSaves(const char *target) const override;
|
||||
SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override;
|
||||
void removeSaveState(const char *target, int slot) const override;
|
||||
};
|
||||
|
||||
bool BbvsMetaEngineConnect::hasFeature(MetaEngineFeature f) const {
|
||||
return
|
||||
(f == kSupportsListSaves) ||
|
||||
(f == kSupportsDeleteSave) ||
|
||||
(f == kSupportsLoadingDuringStartup) ||
|
||||
(f == kSavesSupportMetaInfo) ||
|
||||
(f == kSavesSupportThumbnail) ||
|
||||
(f == kSavesSupportCreationDate) ||
|
||||
(f == kSimpleSavesNames);
|
||||
}
|
||||
|
||||
void BbvsMetaEngineConnect::removeSaveState(const char *target, int slot) const {
|
||||
Common::String fileName = Common::String::format("%s.%03d", target, slot);
|
||||
g_system->getSavefileManager()->removeSavefile(fileName);
|
||||
}
|
||||
|
||||
int BbvsMetaEngineConnect::getMaximumSaveSlot() const {
|
||||
return 999;
|
||||
}
|
||||
|
||||
SaveStateList BbvsMetaEngineConnect::listSaves(const char *target) const {
|
||||
Common::SaveFileManager *saveFileMan = g_system->getSavefileManager();
|
||||
Bbvs::BbvsEngine::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 (Bbvs::BbvsEngine::readSaveHeader(in, header) == Bbvs::BbvsEngine::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;
|
||||
}
|
||||
|
||||
SaveStateDescriptor BbvsMetaEngineConnect::querySaveMetaInfos(const char *target, int slot) const {
|
||||
Common::String filename = Bbvs::BbvsEngine::getSavegameFilename(target, slot);
|
||||
Common::InSaveFile *in = g_system->getSavefileManager()->openForLoading(filename.c_str());
|
||||
if (in) {
|
||||
Bbvs::BbvsEngine::SaveHeader header;
|
||||
Bbvs::BbvsEngine::kReadSaveHeaderError error;
|
||||
error = Bbvs::BbvsEngine::readSaveHeader(in, header, false);
|
||||
delete in;
|
||||
if (error == Bbvs::BbvsEngine::kRSHENoError) {
|
||||
SaveStateDescriptor desc(slot, header.description);
|
||||
// Slot 0 is used for the "Continue" save
|
||||
desc.setDeletableFlag(slot != 0);
|
||||
desc.setWriteProtectedFlag(slot == 0);
|
||||
desc.setThumbnail(header.thumbnail);
|
||||
desc.setSaveDate(header.saveDate & 0xFFFF, (header.saveDate >> 16) & 0xFF, (header.saveDate >> 24) & 0xFF);
|
||||
desc.setSaveTime((header.saveTime >> 16) & 0xFF, (header.saveTime >> 8) & 0xFF);
|
||||
desc.setPlayTime(header.playTime * 1000);
|
||||
return desc;
|
||||
}
|
||||
}
|
||||
return SaveStateDescriptor();
|
||||
}
|
||||
|
||||
bool BbvsMetaEngineConnect::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
|
||||
if (desc) {
|
||||
*engine = new Bbvs::BbvsEngine(syst, desc);
|
||||
}
|
||||
return desc != 0;
|
||||
}
|
||||
|
||||
#if PLUGIN_ENABLED_DYNAMIC(BBVS)
|
||||
REGISTER_PLUGIN_DYNAMIC(BBVS, PLUGIN_TYPE_ENGINE, BbvsMetaEngineConnect);
|
||||
#else
|
||||
REGISTER_PLUGIN_STATIC(BBVS, PLUGIN_TYPE_ENGINE, BbvsMetaEngineConnect);
|
||||
#endif
|
||||
|
|
@ -2,11 +2,11 @@ MODULE := engines/bbvs
|
|||
|
||||
MODULE_OBJS := \
|
||||
bbvs.o \
|
||||
detection.o \
|
||||
dialogs.o \
|
||||
gamemodule.o \
|
||||
graphics.o \
|
||||
logic.o \
|
||||
metaengine.o \
|
||||
saveload.o \
|
||||
scene.o \
|
||||
sound.o \
|
||||
|
|
@ -30,3 +30,6 @@ endif
|
|||
|
||||
# Include common rules
|
||||
include $(srcdir)/rules.mk
|
||||
|
||||
# Detection objects
|
||||
DETECT_OBJS += $(MODULE)/detection.o
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue