[Scummvm-git-logs] scummvm master -> a020300701a4b9f6df91c6fcd8a74f478cdcb8b6
sev-
noreply at scummvm.org
Wed Jul 20 09:54:24 UTC 2022
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
a020300701 ENGINES: Remove use of getEngineId() in MetaEngine subclasses
Commit: a020300701a4b9f6df91c6fcd8a74f478cdcb8b6
https://github.com/scummvm/scummvm/commit/a020300701a4b9f6df91c6fcd8a74f478cdcb8b6
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2022-07-20T11:54:19+02:00
Commit Message:
ENGINES: Remove use of getEngineId() in MetaEngine subclasses
Changed paths:
base/plugins.cpp
base/plugins.h
engines/ags/metaengine.cpp
engines/cine/metaengine.cpp
engines/composer/metaengine.cpp
engines/cryomni3d/metaengine.cpp
engines/griffon/metaengine.cpp
engines/hugo/metaengine.cpp
engines/lilliput/metaengine.cpp
engines/metaengine.cpp
engines/mohawk/metaengine.cpp
engines/mortevielle/metaengine.cpp
engines/parallaction/metaengine.cpp
engines/stark/metaengine.cpp
engines/teenagent/metaengine.cpp
engines/touche/metaengine.cpp
engines/tucker/metaengine.cpp
diff --git a/base/plugins.cpp b/base/plugins.cpp
index e6022be019d..f4c7ded6693 100644
--- a/base/plugins.cpp
+++ b/base/plugins.cpp
@@ -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;
diff --git a/base/plugins.h b/base/plugins.h
index 03768f4fec0..bfe7ab2174f 100644
--- a/base/plugins.h
+++ b/base/plugins.h
@@ -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;
- }
};
/**
diff --git a/engines/ags/metaengine.cpp b/engines/ags/metaengine.cpp
index cc446cf9b3e..263997bcbb2 100644
--- a/engines/ags/metaengine.cpp
+++ b/engines/ags/metaengine.cpp
@@ -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);
}
}
diff --git a/engines/cine/metaengine.cpp b/engines/cine/metaengine.cpp
index 8c16fe614f7..26d3c63758a 100644
--- a/engines/cine/metaengine.cpp
+++ b/engines/cine/metaengine.cpp
@@ -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 {
diff --git a/engines/composer/metaengine.cpp b/engines/composer/metaengine.cpp
index 7378769a721..828d27d9cd5 100644
--- a/engines/composer/metaengine.cpp
+++ b/engines/composer/metaengine.cpp
@@ -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
diff --git a/engines/cryomni3d/metaengine.cpp b/engines/cryomni3d/metaengine.cpp
index e78f56bd8f5..8b426bee033 100644
--- a/engines/cryomni3d/metaengine.cpp
+++ b/engines/cryomni3d/metaengine.cpp
@@ -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
diff --git a/engines/griffon/metaengine.cpp b/engines/griffon/metaengine.cpp
index a8aff71af57..990688c18e0 100644
--- a/engines/griffon/metaengine.cpp
+++ b/engines/griffon/metaengine.cpp
@@ -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);
}
}
diff --git a/engines/hugo/metaengine.cpp b/engines/hugo/metaengine.cpp
index 723a6020709..4bbcee9eb63 100644
--- a/engines/hugo/metaengine.cpp
+++ b/engines/hugo/metaengine.cpp
@@ -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
diff --git a/engines/lilliput/metaengine.cpp b/engines/lilliput/metaengine.cpp
index dce6efae452..9bb6ead78f3 100644
--- a/engines/lilliput/metaengine.cpp
+++ b/engines/lilliput/metaengine.cpp
@@ -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
diff --git a/engines/metaengine.cpp b/engines/metaengine.cpp
index f8b6e25d489..b158788a914 100644
--- a/engines/metaengine.cpp
+++ b/engines/metaengine.cpp
@@ -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##";
diff --git a/engines/mohawk/metaengine.cpp b/engines/mohawk/metaengine.cpp
index 5ea6bfb9cfd..3ab65f886a2 100644
--- a/engines/mohawk/metaengine.cpp
+++ b/engines/mohawk/metaengine.cpp
@@ -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.
diff --git a/engines/mortevielle/metaengine.cpp b/engines/mortevielle/metaengine.cpp
index 15675e4a60a..505a77b0095 100644
--- a/engines/mortevielle/metaengine.cpp
+++ b/engines/mortevielle/metaengine.cpp
@@ -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
diff --git a/engines/parallaction/metaengine.cpp b/engines/parallaction/metaengine.cpp
index d3dd51ace12..6740b826f14 100644
--- a/engines/parallaction/metaengine.cpp
+++ b/engines/parallaction/metaengine.cpp
@@ -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 + ".###";
diff --git a/engines/stark/metaengine.cpp b/engines/stark/metaengine.cpp
index 0444f9679aa..888c79d1084 100644
--- a/engines/stark/metaengine.cpp
+++ b/engines/stark/metaengine.cpp
@@ -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
diff --git a/engines/teenagent/metaengine.cpp b/engines/teenagent/metaengine.cpp
index cb6280e75c8..3d8f5de3f8d 100644
--- a/engines/teenagent/metaengine.cpp
+++ b/engines/teenagent/metaengine.cpp
@@ -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
diff --git a/engines/touche/metaengine.cpp b/engines/touche/metaengine.cpp
index f8b1abbd7bc..90368364576 100644
--- a/engines/touche/metaengine.cpp
+++ b/engines/touche/metaengine.cpp
@@ -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);
}
};
diff --git a/engines/tucker/metaengine.cpp b/engines/tucker/metaengine.cpp
index ed5cc84b819..4b92364c8fe 100644
--- a/engines/tucker/metaengine.cpp
+++ b/engines/tucker/metaengine.cpp
@@ -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);
}
};
More information about the Scummvm-git-logs
mailing list