aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Hesse2012-06-27 19:11:28 +0200
committerSven Hesse2012-07-30 01:26:58 +0200
commitbba2028fbaa1c2b3b2b89badd6bf8f36cbbe1cc1 (patch)
treef8ed13eeea44e9815f93764817de694e39e38aba
parent00fa997039525eeeacc34734e9a12e53f7b847dd (diff)
downloadscummvm-rg350-bba2028fbaa1c2b3b2b89badd6bf8f36cbbe1cc1.tar.gz
scummvm-rg350-bba2028fbaa1c2b3b2b89badd6bf8f36cbbe1cc1.tar.bz2
scummvm-rg350-bba2028fbaa1c2b3b2b89badd6bf8f36cbbe1cc1.zip
GOB: Move the method definitions out of the GobMetaEngine class definition
-rw-r--r--engines/gob/detection/detection.cpp71
1 files changed, 43 insertions, 28 deletions
diff --git a/engines/gob/detection/detection.cpp b/engines/gob/detection/detection.cpp
index 14da54637b..8b4fab4409 100644
--- a/engines/gob/detection/detection.cpp
+++ b/engines/gob/detection/detection.cpp
@@ -30,43 +30,51 @@
class GobMetaEngine : public AdvancedMetaEngine {
public:
- GobMetaEngine() : AdvancedMetaEngine(Gob::gameDescriptions, sizeof(Gob::GOBGameDescription), gobGames) {
- _singleid = "gob";
- _guioptions = GUIO1(GUIO_NOLAUNCHLOAD);
- }
-
- virtual GameDescriptor findGame(const char *gameid) const {
- return Engines::findGameID(gameid, _gameids, obsoleteGameIDsTable);
- }
+ GobMetaEngine();
- virtual const ADGameDescription *fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const {
- ADFilePropertiesMap filesProps;
+ virtual GameDescriptor findGame(const char *gameid) const;
- const ADGameDescription *game = detectGameFilebased(allFiles, fslist, Gob::fileBased, &filesProps);
- if (!game)
- return 0;
+ virtual const ADGameDescription *fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const;
- reportUnknown(fslist.begin()->getParent(), filesProps);
- return game;
- }
-
- virtual const char *getName() const {
- return "Gob";
- }
-
- virtual const char *getOriginalCopyright() const {
- return "Goblins Games (C) Coktel Vision";
- }
+ virtual const char *getName() const;
+ virtual const char *getOriginalCopyright() const;
virtual bool hasFeature(MetaEngineFeature f) const;
- virtual Common::Error createInstance(OSystem *syst, Engine **engine) const {
- Engines::upgradeTargetIfNecessary(obsoleteGameIDsTable);
- return AdvancedMetaEngine::createInstance(syst, engine);
- }
+ virtual Common::Error createInstance(OSystem *syst, Engine **engine) const;
virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
};
+GobMetaEngine::GobMetaEngine() :
+ AdvancedMetaEngine(Gob::gameDescriptions, sizeof(Gob::GOBGameDescription), gobGames) {
+
+ _singleid = "gob";
+ _guioptions = GUIO1(GUIO_NOLAUNCHLOAD);
+}
+
+GameDescriptor GobMetaEngine::findGame(const char *gameid) const {
+ return Engines::findGameID(gameid, _gameids, obsoleteGameIDsTable);
+}
+
+const ADGameDescription *GobMetaEngine::fallbackDetect(const FileMap &allFiles, const Common::FSList &fslist) const {
+ ADFilePropertiesMap filesProps;
+
+ const ADGameDescription *game = detectGameFilebased(allFiles, fslist, Gob::fileBased, &filesProps);
+ if (!game)
+ return 0;
+
+ reportUnknown(fslist.begin()->getParent(), filesProps);
+ return game;
+}
+
+const char *GobMetaEngine::getName() const {
+ return "Gob";
+}
+
+const char *GobMetaEngine::getOriginalCopyright() const {
+ return "Goblins Games (C) Coktel Vision";
+}
+
bool GobMetaEngine::hasFeature(MetaEngineFeature f) const {
return false;
}
@@ -75,6 +83,12 @@ bool Gob::GobEngine::hasFeature(EngineFeature f) const {
return
(f == kSupportsRTL);
}
+
+Common::Error GobMetaEngine::createInstance(OSystem *syst, Engine **engine) const {
+ Engines::upgradeTargetIfNecessary(obsoleteGameIDsTable);
+ return AdvancedMetaEngine::createInstance(syst, engine);
+}
+
bool GobMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
const Gob::GOBGameDescription *gd = (const Gob::GOBGameDescription *)desc;
if (gd) {
@@ -84,6 +98,7 @@ bool GobMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameD
return gd != 0;
}
+
#if PLUGIN_ENABLED_DYNAMIC(GOB)
REGISTER_PLUGIN_DYNAMIC(GOB, PLUGIN_TYPE_ENGINE, GobMetaEngine);
#else