thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ENGINES: Remove use of getEngineId() in MetaEngine subclasses

Browse source
This commit is contained in:
Cameron Cawley 2022-01-05 16:16:41 +00:00 • committed by Eugene Sandulenko
parent af04a879b8
commit a020300701
17 changed files with 18 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

2
base/plugins.cpp
View file

@ -57,7 +57,7 @@ const char *Plugin::getName() const {
const char *Plugin::getEngineId() const {
if (_type == PLUGIN_TYPE_ENGINE_DETECTION) {
return _pluginObject->getEngineId();
return get<MetaEngineDetection>().getEngineId();
}
return nullptr;

12
base/plugins.h
View file

@ -133,18 +133,6 @@ public:
/** Returns the name of the plugin. */
virtual const char *getName() const = 0;
/**
* Returns the engine id of the plugin, if implemented.
* This mostly has the use with MetaEngines, but if another
* type of plugins request this, we return a nullptr.
* This is used because MetaEngines are now available in the
* executable, and querying this we can match a MetaEngine
* with it's related engine.
*/
virtual const char *getEngineId() const {
return nullptr;
}
};
/**

4
engines/ags/metaengine.cpp
View file

@ -91,10 +91,10 @@ bool AGSMetaEngine::hasFeature(MetaEngineFeature f) const {
Common::String AGSMetaEngine::getSavegameFile(int saveGameIdx, const char *target) const {
if (saveGameIdx == kSavegameFilePattern) {
// Pattern requested
return Common::String::format("%s.###", target == nullptr ? getEngineId() : target);
return Common::String::format("%s.###", target == nullptr ? getName() : target);
} else {
// Specific filename requested
return Common::String::format("%s.%03d", target == nullptr ? getEngineId() : target, saveGameIdx);
return Common::String::format("%s.%03d", target == nullptr ? getName() : target, saveGameIdx);
}
}

2
engines/cine/metaengine.cpp
View file

@ -161,7 +161,7 @@ SaveStateList CineMetaEngine::listSaves(const char *target) const {
int CineMetaEngine::getMaximumSaveSlot() const { return MAX_SAVEGAMES - 1; }
Common::String CineMetaEngine::getSavegameFile(int saveGameIdx, const char *target) const {
return Common::String::format("%s.%d", target == nullptr ? getEngineId() : target, saveGameIdx);
return Common::String::format("%s.%d", target == nullptr ? getName() : target, saveGameIdx);
}
SaveStateDescriptor CineMetaEngine::querySaveMetaInfos(const char *target, int slot) const {

2
engines/composer/metaengine.cpp
View file

@ -77,7 +77,7 @@ public:
SaveStateList listSaves(const char* target) const override;
Common::String getSavegameFile(int saveGameIdx, const char *target) const override {
if (!target)
target = getEngineId();
target = getName();
if (saveGameIdx == kSavegameFilePattern)
return Common::String::format("%s.##", target);
else

2
engines/cryomni3d/metaengine.cpp
View file

@ -80,7 +80,7 @@ public:
void removeSaveState(const char *target, int slot) const override;
Common::String getSavegameFile(int saveGameIdx, const char *target) const override {
if (!target)
target = getEngineId();
target = getName();
if (saveGameIdx == kSavegameFilePattern)
return Common::String::format("%s.####", target);
else

4
engines/griffon/metaengine.cpp
View file

@ -54,10 +54,10 @@ public:
Common::String GriffonMetaEngine::getSavegameFile(int saveGameIdx, const char *target) const {
if (saveGameIdx == kSavegameFilePattern) {
// Pattern requested
return Common::String::format("%s.s##", target == nullptr ? getEngineId() : target);
return Common::String::format("%s.s##", target == nullptr ? getName() : target);
} else {
// Specific filename requested
return Common::String::format("%s.s%02d", target == nullptr ? getEngineId() : target, saveGameIdx);
return Common::String::format("%s.s%02d", target == nullptr ? getName() : target, saveGameIdx);
}
}

2
engines/hugo/metaengine.cpp
View file

@ -54,7 +54,7 @@ public:
void removeSaveState(const char *target, int slot) const override;
Common::String getSavegameFile(int saveGameIdx, const char *target) const override {
if (!target)
target = getEngineId();
target = getName();
if (saveGameIdx == kSavegameFilePattern)
return Common::String::format("%s-##.SAV", target);
else

2
engines/lilliput/metaengine.cpp
View file

@ -58,7 +58,7 @@ public:
void removeSaveState(const char *target, int slot) const override;
Common::String getSavegameFile(int saveGameIdx, const char *target) const override {
if (!target)
target = getEngineId();
target = getName();
if (saveGameIdx == kSavegameFilePattern)
return Common::String::format("%s-##.SAV", target);
else

2
engines/metaengine.cpp
View file

@ -38,7 +38,7 @@
Common::String MetaEngine::getSavegameFile(int saveGameIdx, const char *target) const {
if (!target)
target = getEngineId();
target = getName();
if (saveGameIdx == kSavegameFilePattern) {
// Pattern requested
const char *pattern = hasFeature(kSimpleSavesNames) ? "%s.###" : "%s.s##";

2
engines/mohawk/metaengine.cpp
View file

@ -143,7 +143,7 @@ public:
GUI::OptionsContainerWidget *buildEngineOptionsWidgetDynamic(GUI::GuiObject *boss, const Common::String &name, const Common::String &target) const override;
Common::String getSavegameFile(int saveGameIdx, const char *target) const override {
if (!target)
target = getEngineId();
target = getName();
Common::String gameId = ConfMan.get("gameid", target);
const char *suffix;
// Saved games are only supported in Myst/Riven currently.

2
engines/mortevielle/metaengine.cpp
View file

@ -52,7 +52,7 @@ public:
SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override;
Common::String getSavegameFile(int saveGameIdx, const char *target) const override {
if (!target)
target = getEngineId();
target = getName();
if (saveGameIdx == kSavegameFilePattern)
return Common::String::format("%s.###", target); // There is also sav0.mor for slot 0
else

2
engines/parallaction/metaengine.cpp
View file

@ -58,7 +58,7 @@ public:
void removeSaveState(const char *target, int slot) const override;
Common::String getSavegameFile(int saveGameIdx, const char *target) const override {
if (!target)
target = getEngineId();
target = getName();
const Common::String prefix = ConfMan.getDomain(target)->getVal("gameid");
if (saveGameIdx == kSavegameFilePattern)
return prefix + ".###";

2
engines/stark/metaengine.cpp
View file

@ -120,7 +120,7 @@ public:
Common::String getSavegameFile(int saveGameIdx, const char *target) const override {
if (!target)
target = getEngineId();
target = getName();
if (saveGameIdx == kSavegameFilePattern)
return Common::String::format("%s-###.tlj", target);
else

2
engines/teenagent/metaengine.cpp
View file

@ -60,7 +60,7 @@ public:
Common::String getSavegameFile(int saveGameIdx, const char *target) const override {
if (!target)
target = getEngineId();
target = getName();
if (saveGameIdx == kSavegameFilePattern)
return Common::String::format("%s.##", target);
else

2
engines/touche/metaengine.cpp
View file

@ -41,7 +41,7 @@ public:
void removeSaveState(const char *target, int slot) const override;
Common::String getSavegameFile(int saveGameIdx, const char *target) const override {
if (!target)
target = getEngineId();
target = getName();
return Touche::generateGameStateFileName(target, saveGameIdx, saveGameIdx == kSavegameFilePattern);
}
};

2
engines/tucker/metaengine.cpp
View file

@ -147,7 +147,7 @@ public:
Common::String getSavegameFile(int saveGameIdx, const char *target) const override {
if (!target)
target = getEngineId();
target = getName();
return Tucker::generateGameStateFileName(target, saveGameIdx, saveGameIdx == kSavegameFilePattern);
}
};