[Scummvm-git-logs] scummvm master -> 5b8032052521d129cddbce9ddf01c41c897fd4d7
dreammaster
paulfgilbert at gmail.com
Wed Feb 5 04:13:38 UTC 2020
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
9f8c45ac4e ENGINES: Provide a default MetaEngine::hasFeature with extended save options on
5b80320525 ENGINES: Adding override keyword to hasFeature methods
Commit: 9f8c45ac4ef7870e54a52ce77e9b008692f57116
https://github.com/scummvm/scummvm/commit/9f8c45ac4ef7870e54a52ce77e9b008692f57116
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-02-04T20:04:11-08:00
Commit Message:
ENGINES: Provide a default MetaEngine::hasFeature with extended save options on
Changed paths:
engines/griffon/detection.cpp
engines/metaengine.cpp
engines/metaengine.h
engines/ultima/detection.cpp
engines/ultima/detection.h
diff --git a/engines/griffon/detection.cpp b/engines/griffon/detection.cpp
index 8c65573..1e42239 100644
--- a/engines/griffon/detection.cpp
+++ b/engines/griffon/detection.cpp
@@ -68,22 +68,9 @@ public:
return "The Griffon Legend (c) 2005 Syn9 (Daniel Kennedy)";
}
- virtual bool hasFeature(MetaEngineFeature f) const;
virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
};
-bool GriffonMetaEngine::hasFeature(MetaEngineFeature f) const {
- return
- (f == kSupportsListSaves) ||
- (f == kSupportsDeleteSave) ||
- (f == kSavesSupportMetaInfo) ||
- (f == kSavesSupportThumbnail) ||
- (f == kSavesSupportCreationDate) ||
- (f == kSavesSupportPlayTime) ||
- (f == kSupportsLoadingDuringStartup) ||
- (f == kSavesUseExtendedFormat);
-}
-
bool Griffon::GriffonEngine::hasFeature(EngineFeature f) const {
return
(f == kSupportsRTL) ||
diff --git a/engines/metaengine.cpp b/engines/metaengine.cpp
index a5816d5..a296d90 100644
--- a/engines/metaengine.cpp
+++ b/engines/metaengine.cpp
@@ -129,6 +129,18 @@ Common::KeymapArray MetaEngine::initKeymaps(const char *target) const {
return Keymap::arrayOf(engineKeyMap);
}
+bool MetaEngine::hasFeature(MetaEngineFeature f) const {
+ return
+ (f == kSupportsListSaves) ||
+ (f == kSupportsDeleteSave) ||
+ (f == kSavesSupportMetaInfo) ||
+ (f == kSavesSupportThumbnail) ||
+ (f == kSavesSupportCreationDate) ||
+ (f == kSavesSupportPlayTime) ||
+ (f == kSupportsLoadingDuringStartup) ||
+ (f == kSavesUseExtendedFormat);
+}
+
void MetaEngine::appendExtendedSave(Common::OutSaveFile *saveFile, uint32 playtime, Common::String desc) {
ExtendedSavegameHeader header;
diff --git a/engines/metaengine.h b/engines/metaengine.h
index 561f7d5..4dfcc54 100644
--- a/engines/metaengine.h
+++ b/engines/metaengine.h
@@ -318,9 +318,7 @@ public:
* Determine whether the engine supports the specified MetaEngine feature.
* Used by e.g. the launcher to determine whether to enable the "Load" button.
*/
- virtual bool hasFeature(MetaEngineFeature f) const {
- return false;
- }
+ virtual bool hasFeature(MetaEngineFeature f) const;
static void appendExtendedSave(Common::OutSaveFile *saveFile, uint32 playtime, Common::String desc);
static void parseSavegameHeader(ExtendedSavegameHeader *header, SaveStateDescriptor *desc);
diff --git a/engines/ultima/detection.cpp b/engines/ultima/detection.cpp
index 0ddd6ef..0a4c3c1 100644
--- a/engines/ultima/detection.cpp
+++ b/engines/ultima/detection.cpp
@@ -68,18 +68,6 @@ UltimaMetaEngine::~UltimaMetaEngine() {
Ultima::g_metaEngine = nullptr;
}
-bool UltimaMetaEngine::hasFeature(MetaEngineFeature f) const {
- return
- (f == kSupportsListSaves) ||
- (f == kSupportsDeleteSave) ||
- (f == kSavesSupportMetaInfo) ||
- (f == kSavesSupportThumbnail) ||
- (f == kSavesSupportCreationDate) ||
- (f == kSavesSupportPlayTime) ||
- (f == kSupportsLoadingDuringStartup) ||
- (f == kSavesUseExtendedFormat);
-}
-
bool UltimaMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
const Ultima::UltimaGameDescription *gd = (const Ultima::UltimaGameDescription *)desc;
if (gd) {
diff --git a/engines/ultima/detection.h b/engines/ultima/detection.h
index a212c6a..8fbb0c7 100644
--- a/engines/ultima/detection.h
+++ b/engines/ultima/detection.h
@@ -78,7 +78,6 @@ public:
virtual const char *getSavegamePattern(const char *target = nullptr) const override;
virtual const char *getSavegameFile(int saveGameIdx, const char *target = nullptr) const override;
- virtual bool hasFeature(MetaEngineFeature f) const override;
virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
virtual int getMaximumSaveSlot() const override;
};
Commit: 5b8032052521d129cddbce9ddf01c41c897fd4d7
https://github.com/scummvm/scummvm/commit/5b8032052521d129cddbce9ddf01c41c897fd4d7
Author: Paul Gilbert (dreammaster at scummvm.org)
Date: 2020-02-04T20:04:11-08:00
Commit Message:
ENGINES: Adding override keyword to hasFeature methods
Changed paths:
engines/access/access.h
engines/access/detection.cpp
engines/adl/adl.h
engines/agi/agi.h
engines/agos/agos.h
engines/avalanche/avalanche.h
engines/avalanche/detection.cpp
engines/bbvs/bbvs.h
engines/bbvs/detection.cpp
engines/cge/cge.h
engines/cge2/cge2.h
engines/chewy/chewy.h
engines/chewy/detection.cpp
engines/cine/cine.h
engines/cine/detection.cpp
engines/composer/composer.h
engines/composer/detection.cpp
engines/cruise/cruise.h
engines/cruise/detection.cpp
engines/cryo/detection.cpp
engines/director/director.h
engines/dm/dm.h
engines/draci/detection.cpp
engines/drascula/detection.cpp
engines/drascula/drascula.h
engines/dreamweb/detection.cpp
engines/dreamweb/dreamweb.h
engines/fullpipe/detection.cpp
engines/fullpipe/fullpipe.h
engines/gnap/detection.cpp
engines/gnap/gnap.h
engines/gob/gob.h
engines/griffon/griffon.h
engines/groovie/detection.cpp
engines/groovie/groovie.h
engines/hdb/detection.cpp
engines/hopkins/detection.cpp
engines/hopkins/hopkins.h
engines/hugo/detection.cpp
engines/hugo/hugo.h
engines/illusions/bbdou/illusions_bbdou.h
engines/illusions/detection.cpp
engines/illusions/duckman/illusions_duckman.h
engines/kyra/kyra_v1.h
engines/lab/detection.cpp
engines/lab/lab.h
engines/lastexpress/lastexpress.h
engines/lilliput/detection.cpp
engines/lilliput/lilliput.h
engines/lure/detection.cpp
engines/lure/lure.h
engines/macventure/macventure.h
engines/made/made.h
engines/mads/detection.cpp
engines/mads/mads.h
engines/mortevielle/detection.cpp
engines/mortevielle/mortevielle.h
engines/neverhood/detection.cpp
engines/neverhood/neverhood.h
engines/parallaction/detection.cpp
engines/parallaction/parallaction.h
engines/pegasus/pegasus.h
engines/pink/detection.cpp
engines/plumbers/detection.cpp
engines/prince/detection.cpp
engines/prince/prince.h
engines/queen/queen.h
engines/saga/detection.cpp
engines/saga/saga.h
engines/sci/sci.h
engines/scumm/scumm.h
engines/sherlock/detection.cpp
engines/sherlock/sherlock.h
engines/sky/sky.h
engines/startrek/detection.cpp
engines/supernova/detection.cpp
engines/supernova/supernova.h
engines/sword1/sword1.h
engines/sword2/sword2.h
engines/sword25/detection.cpp
engines/sword25/sword25.h
engines/teenagent/teenagent.h
engines/testbed/testbed.h
engines/tinsel/tinsel.h
engines/titanic/detection.cpp
engines/titanic/titanic.h
engines/toltecs/detection.cpp
engines/toltecs/toltecs.h
engines/tony/detection.cpp
engines/tony/tony.h
engines/touche/touche.h
engines/tsage/tsage.h
engines/tucker/tucker.h
engines/voyeur/detection.cpp
engines/voyeur/voyeur.h
engines/wage/detection.cpp
engines/wage/wage.h
engines/wintermute/wintermute.h
engines/xeen/detection.cpp
engines/xeen/xeen.h
engines/zvision/detection.cpp
engines/zvision/zvision.h
diff --git a/engines/access/access.h b/engines/access/access.h
index 56646f0..ad6b10e 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -124,7 +124,7 @@ protected:
// Engine APIs
virtual Common::Error run();
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
protected:
/**
* Play the game
diff --git a/engines/access/detection.cpp b/engines/access/detection.cpp
index b452d25..34fbc6c 100644
--- a/engines/access/detection.cpp
+++ b/engines/access/detection.cpp
@@ -100,7 +100,7 @@ public:
return "Access Engine (C) 1989-1994 Access Software";
}
- virtual bool hasFeature(MetaEngineFeature f) const;
+ virtual bool hasFeature(MetaEngineFeature f) const override;
virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
virtual SaveStateList listSaves(const char *target) const;
virtual int getMaximumSaveSlot() const;
diff --git a/engines/adl/adl.h b/engines/adl/adl.h
index 7ab21d9..021084b 100644
--- a/engines/adl/adl.h
+++ b/engines/adl/adl.h
@@ -446,7 +446,7 @@ private:
Common::String getScriptLine() const;
// Engine
Common::Error run();
- bool hasFeature(EngineFeature f) const;
+ bool hasFeature(EngineFeature f) const override;
bool canLoadGameStateCurrently();
// Text input
diff --git a/engines/agi/agi.h b/engines/agi/agi.h
index 56f245c..17f8748 100644
--- a/engines/agi/agi.h
+++ b/engines/agi/agi.h
@@ -720,7 +720,7 @@ protected:
return err;
return go();
}
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
virtual void initialize() = 0;
diff --git a/engines/agos/agos.h b/engines/agos/agos.h
index 2874c33..9f178b5 100644
--- a/engines/agos/agos.h
+++ b/engines/agos/agos.h
@@ -224,7 +224,7 @@ protected:
return go();
}
virtual GUI::Debugger *getDebugger();
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
virtual void syncSoundSettings();
virtual void pauseEngineIntern(bool pause);
diff --git a/engines/avalanche/avalanche.h b/engines/avalanche/avalanche.h
index d50373b..3bbc339 100644
--- a/engines/avalanche/avalanche.h
+++ b/engines/avalanche/avalanche.h
@@ -106,7 +106,7 @@ public:
uint32 getFeatures() const;
const char *getGameId() const;
Common::Platform getPlatform() const;
- bool hasFeature(EngineFeature f) const;
+ bool hasFeature(EngineFeature f) const override;
const char *getCopyrightString() const;
void synchronize(Common::Serializer &sz);
diff --git a/engines/avalanche/detection.cpp b/engines/avalanche/detection.cpp
index 4eefe57..625bc42 100644
--- a/engines/avalanche/detection.cpp
+++ b/engines/avalanche/detection.cpp
@@ -91,7 +91,7 @@ public:
}
bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const;
- bool hasFeature(MetaEngineFeature f) const;
+ bool hasFeature(MetaEngineFeature f) const override;
int getMaximumSaveSlot() const { return 99; }
SaveStateList listSaves(const char *target) const;
diff --git a/engines/bbvs/bbvs.h b/engines/bbvs/bbvs.h
index cfa7abf..fdda2c8 100644
--- a/engines/bbvs/bbvs.h
+++ b/engines/bbvs/bbvs.h
@@ -219,7 +219,7 @@ static const int8 kWalkTurnTbl[] = {
class BbvsEngine : public Engine {
protected:
Common::Error run();
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
public:
BbvsEngine(OSystem *syst, const ADGameDescription *gd);
~BbvsEngine();
diff --git a/engines/bbvs/detection.cpp b/engines/bbvs/detection.cpp
index 19d1b62..e53aa07 100644
--- a/engines/bbvs/detection.cpp
+++ b/engines/bbvs/detection.cpp
@@ -85,7 +85,7 @@ public:
return "(C) 1995 Viacom New Media";
}
- virtual bool hasFeature(MetaEngineFeature f) const;
+ virtual bool hasFeature(MetaEngineFeature f) const override;
virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
virtual int getMaximumSaveSlot() const;
virtual SaveStateList listSaves(const char *target) const;
diff --git a/engines/cge/cge.h b/engines/cge/cge.h
index 9a8ea0d..c5e007d 100644
--- a/engines/cge/cge.h
+++ b/engines/cge/cge.h
@@ -137,7 +137,7 @@ private:
public:
CGEEngine(OSystem *syst, const ADGameDescription *gameDescription);
~CGEEngine();
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
virtual bool canLoadGameStateCurrently();
virtual bool canSaveGameStateCurrently();
virtual Common::Error loadGameState(int slot);
diff --git a/engines/cge2/cge2.h b/engines/cge2/cge2.h
index 1fa23ad..72de1cb 100644
--- a/engines/cge2/cge2.h
+++ b/engines/cge2/cge2.h
@@ -156,7 +156,7 @@ private:
void resetGame();
public:
CGE2Engine(OSystem *syst, const ADGameDescription *gameDescription);
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
virtual bool canSaveGameStateCurrently();
virtual bool canLoadGameStateCurrently();
virtual Common::Error saveGameState(int slot, const Common::String &desc);
diff --git a/engines/chewy/chewy.h b/engines/chewy/chewy.h
index 6ebeff8..997d123 100644
--- a/engines/chewy/chewy.h
+++ b/engines/chewy/chewy.h
@@ -69,7 +69,7 @@ public:
protected:
// Engine APIs
virtual Common::Error run();
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
void initialize();
void shutdown();
diff --git a/engines/chewy/detection.cpp b/engines/chewy/detection.cpp
index 2206202..618b9e5 100644
--- a/engines/chewy/detection.cpp
+++ b/engines/chewy/detection.cpp
@@ -129,7 +129,7 @@ public:
return "Chewy: Esc from F5 (C) 1995 New Generation Software";
}
- virtual bool hasFeature(MetaEngineFeature f) const;
+ virtual bool hasFeature(MetaEngineFeature f) const override;
virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
SaveStateList listSaves(const char *target) const;
virtual int getMaximumSaveSlot() const;
diff --git a/engines/cine/cine.h b/engines/cine/cine.h
index 615e36d..044be29 100644
--- a/engines/cine/cine.h
+++ b/engines/cine/cine.h
@@ -104,7 +104,7 @@ class CineEngine : public Engine {
protected:
// Engine APIs
virtual Common::Error run();
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
void shutdown();
diff --git a/engines/cine/detection.cpp b/engines/cine/detection.cpp
index 55e76c6..00c7ee4 100644
--- a/engines/cine/detection.cpp
+++ b/engines/cine/detection.cpp
@@ -92,7 +92,7 @@ public:
}
virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
- virtual bool hasFeature(MetaEngineFeature f) const;
+ virtual bool hasFeature(MetaEngineFeature f) const override;
virtual SaveStateList listSaves(const char *target) const;
virtual int getMaximumSaveSlot() const;
virtual void removeSaveState(const char *target, int slot) const;
diff --git a/engines/composer/composer.h b/engines/composer/composer.h
index 45a4667..a0b48db 100644
--- a/engines/composer/composer.h
+++ b/engines/composer/composer.h
@@ -175,7 +175,7 @@ public:
ComposerEngine(OSystem *syst, const ComposerGameDescription *gameDesc);
virtual ~ComposerEngine();
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
int getGameType() const;
const char *getGameId() const;
diff --git a/engines/composer/detection.cpp b/engines/composer/detection.cpp
index 69100d6..7e62fac 100644
--- a/engines/composer/detection.cpp
+++ b/engines/composer/detection.cpp
@@ -734,7 +734,7 @@ public:
}
virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
- virtual bool hasFeature(MetaEngineFeature f) const;
+ virtual bool hasFeature(MetaEngineFeature f) const override;
virtual int getMaximumSaveSlot() const;
virtual SaveStateList listSaves(const char* target) const;
};
diff --git a/engines/cruise/cruise.h b/engines/cruise/cruise.h
index 8624ba6..aac75c4 100644
--- a/engines/cruise/cruise.h
+++ b/engines/cruise/cruise.h
@@ -80,7 +80,7 @@ protected:
public:
CruiseEngine(OSystem * syst, const CRUISEGameDescription *gameDesc);
virtual ~ CruiseEngine();
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
int getGameType() const;
const char *getGameId() const;
diff --git a/engines/cruise/detection.cpp b/engines/cruise/detection.cpp
index e657318..78c9896 100644
--- a/engines/cruise/detection.cpp
+++ b/engines/cruise/detection.cpp
@@ -210,7 +210,7 @@ public:
return "Cinematique evo 2 (C) Delphine Software";
}
- virtual bool hasFeature(MetaEngineFeature f) const;
+ virtual bool hasFeature(MetaEngineFeature f) const override;
virtual int getMaximumSaveSlot() const { return 99; }
virtual SaveStateList listSaves(const char *target) const;
virtual void removeSaveState(const char *target, int slot) const;
diff --git a/engines/cryo/detection.cpp b/engines/cryo/detection.cpp
index c2be650..4d4e2bd 100644
--- a/engines/cryo/detection.cpp
+++ b/engines/cryo/detection.cpp
@@ -147,7 +147,7 @@ public:
return "Cryo Engine (C) Cryo Interactive";
}
- virtual bool hasFeature(MetaEngineFeature f) const;
+ virtual bool hasFeature(MetaEngineFeature f) const override;
virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
};
diff --git a/engines/director/director.h b/engines/director/director.h
index 0648d1c..35f38c5 100644
--- a/engines/director/director.h
+++ b/engines/director/director.h
@@ -109,7 +109,7 @@ public:
Common::String getCurrentPath() const { return _currentPath; }
void setPalette(int id);
void setPalette(byte *palette, uint16 count);
- bool hasFeature(EngineFeature f) const;
+ bool hasFeature(EngineFeature f) const override;
void loadPalettes();
const byte *getPalette() const { return _currentPalette; }
uint16 getPaletteColorCount() const { return _currentPaletteLength; }
diff --git a/engines/dm/dm.h b/engines/dm/dm.h
index e330cb6..e575020 100644
--- a/engines/dm/dm.h
+++ b/engines/dm/dm.h
@@ -223,7 +223,7 @@ private:
public:
explicit DMEngine(OSystem *syst, const DMADGameDescription *gameDesc);
~DMEngine();
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
virtual Common::Error loadGameState(int slot);
virtual bool canLoadGameStateCurrently();
diff --git a/engines/draci/detection.cpp b/engines/draci/detection.cpp
index 97dbbee..80ae4b5 100644
--- a/engines/draci/detection.cpp
+++ b/engines/draci/detection.cpp
@@ -98,7 +98,7 @@ public:
return "Draci Historie (C) 1995 NoSense";
}
- virtual bool hasFeature(MetaEngineFeature f) const;
+ virtual bool hasFeature(MetaEngineFeature f) const override;
virtual int getMaximumSaveSlot() const { return 99; }
virtual SaveStateList listSaves(const char *target) const;
virtual void removeSaveState(const char *target, int slot) const;
diff --git a/engines/drascula/detection.cpp b/engines/drascula/detection.cpp
index 7c60cf5..86f6428 100644
--- a/engines/drascula/detection.cpp
+++ b/engines/drascula/detection.cpp
@@ -355,7 +355,7 @@ public:
}
virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const;
- virtual bool hasFeature(MetaEngineFeature f) const;
+ virtual bool hasFeature(MetaEngineFeature f) const override;
virtual const ExtraGuiOptions getExtraGuiOptions(const Common::String &target) const;
virtual SaveStateList listSaves(const char *target) const;
virtual int getMaximumSaveSlot() const;
diff --git a/engines/drascula/drascula.h b/engines/drascula/drascula.h
index 856fc8f..c6f7d78 100644
--- a/engines/drascula/drascula.h
+++ b/engines/drascula/drascula.h
@@ -324,7 +324,7 @@ protected:
public:
DrasculaEngine(OSystem *syst, const DrasculaGameDescription *gameDesc);
virtual ~DrasculaEngine();
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
virtual void syncSoundSettings();
diff --git a/engines/dreamweb/detection.cpp b/engines/dreamweb/detection.cpp
index cb81414..82f5619 100644
--- a/engines/dreamweb/detection.cpp
+++ b/engines/dreamweb/detection.cpp
@@ -87,7 +87,7 @@ public:
}
virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
- virtual bool hasFeature(MetaEngineFeature f) const;
+ virtual bool hasFeature(MetaEngineFeature f) const override;
virtual SaveStateList listSaves(const char *target) const;
virtual int getMaximumSaveSlot() const;
virtual void removeSaveState(const char *target, int slot) const;
diff --git a/engines/dreamweb/dreamweb.h b/engines/dreamweb/dreamweb.h
index 542db13..0af31bb 100644
--- a/engines/dreamweb/dreamweb.h
+++ b/engines/dreamweb/dreamweb.h
@@ -106,7 +106,7 @@ private:
protected:
// Engine APIs
virtual Common::Error run();
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
GUI::Debugger *getDebugger() { return _console; }
diff --git a/engines/fullpipe/detection.cpp b/engines/fullpipe/detection.cpp
index 62c9616..51de92a 100644
--- a/engines/fullpipe/detection.cpp
+++ b/engines/fullpipe/detection.cpp
@@ -144,7 +144,7 @@ public:
return "Full Pipe (C) Pipe Studio";
}
- virtual bool hasFeature(MetaEngineFeature f) const;
+ virtual bool hasFeature(MetaEngineFeature f) const override;
virtual int getMaximumSaveSlot() const { return 99; }
virtual SaveStateList listSaves(const char *target) const;
virtual void removeSaveState(const char *target, int slot) const;
diff --git a/engines/fullpipe/fullpipe.h b/engines/fullpipe/fullpipe.h
index ff843fe..8f1b809 100644
--- a/engines/fullpipe/fullpipe.h
+++ b/engines/fullpipe/fullpipe.h
@@ -365,7 +365,7 @@ public:
virtual bool canLoadGameStateCurrently() { return true; }
virtual bool canSaveGameStateCurrently() { return _isSaveAllowed; }
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
};
diff --git a/engines/gnap/detection.cpp b/engines/gnap/detection.cpp
index 343180d..ace288b 100644
--- a/engines/gnap/detection.cpp
+++ b/engines/gnap/detection.cpp
@@ -93,7 +93,7 @@ public:
return "Gnap (C) Artech Digital Entertainment 1997";
}
- virtual bool hasFeature(MetaEngineFeature f) const;
+ virtual bool hasFeature(MetaEngineFeature f) const override;
virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
virtual int getMaximumSaveSlot() const;
virtual SaveStateList listSaves(const char *target) const;
diff --git a/engines/gnap/gnap.h b/engines/gnap/gnap.h
index 45d57fe..dc07f3a 100644
--- a/engines/gnap/gnap.h
+++ b/engines/gnap/gnap.h
@@ -223,7 +223,7 @@ struct GnapSavegameHeader {
class GnapEngine : public Engine {
protected:
Common::Error run();
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
public:
GnapEngine(OSystem *syst, const ADGameDescription *gd);
~GnapEngine();
diff --git a/engines/gob/gob.h b/engines/gob/gob.h
index 730d393..bfb12bc 100644
--- a/engines/gob/gob.h
+++ b/engines/gob/gob.h
@@ -181,7 +181,7 @@ private:
// Engine APIs
virtual Common::Error run();
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
virtual void pauseEngineIntern(bool pause);
virtual void syncSoundSettings();
diff --git a/engines/griffon/griffon.h b/engines/griffon/griffon.h
index ddee6b1..47feb56 100644
--- a/engines/griffon/griffon.h
+++ b/engines/griffon/griffon.h
@@ -435,7 +435,7 @@ private:
virtual bool canLoadGameStateCurrently() { return true; }
virtual bool canSaveGameStateCurrently() { return _gameMode == kGameModePlay; }
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
private:
Graphics::TransparentSurface *_video, *_videoBuffer, *_videoBuffer2, *_videoBuffer3;
diff --git a/engines/groovie/detection.cpp b/engines/groovie/detection.cpp
index 6ce06bd..8993131 100644
--- a/engines/groovie/detection.cpp
+++ b/engines/groovie/detection.cpp
@@ -361,7 +361,7 @@ public:
bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const;
- bool hasFeature(MetaEngineFeature f) const;
+ bool hasFeature(MetaEngineFeature f) const override;
SaveStateList listSaves(const char *target) const;
int getMaximumSaveSlot() const;
void removeSaveState(const char *target, int slot) const;
diff --git a/engines/groovie/groovie.h b/engines/groovie/groovie.h
index f7d9748..3238b26 100644
--- a/engines/groovie/groovie.h
+++ b/engines/groovie/groovie.h
@@ -100,7 +100,7 @@ protected:
// Engine APIs
Common::Error run();
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
virtual bool canLoadGameStateCurrently();
virtual bool canSaveGameStateCurrently();
diff --git a/engines/hdb/detection.cpp b/engines/hdb/detection.cpp
index 5a64a83..b2a5b8e 100644
--- a/engines/hdb/detection.cpp
+++ b/engines/hdb/detection.cpp
@@ -181,7 +181,7 @@ public:
return "Hyperspace Delivery Boy! (C) 2001 Monkeystone Games";
}
- virtual bool hasFeature(MetaEngineFeature f) const;
+ virtual bool hasFeature(MetaEngineFeature f) const override;
virtual int getMaximumSaveSlot() const;
virtual void removeSaveState(const char *target, int slot) const;
virtual SaveStateList listSaves(const char *target) const;
diff --git a/engines/hopkins/detection.cpp b/engines/hopkins/detection.cpp
index 4f6039b..f58e07d 100644
--- a/engines/hopkins/detection.cpp
+++ b/engines/hopkins/detection.cpp
@@ -118,7 +118,7 @@ public:
return "Hopkins FBI (C) 1997-2003 MP Entertainment";
}
- virtual bool hasFeature(MetaEngineFeature f) const;
+ virtual bool hasFeature(MetaEngineFeature f) const override;
virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
virtual SaveStateList listSaves(const char *target) const;
virtual int getMaximumSaveSlot() const;
diff --git a/engines/hopkins/hopkins.h b/engines/hopkins/hopkins.h
index ee2592e..0a328e4 100644
--- a/engines/hopkins/hopkins.h
+++ b/engines/hopkins/hopkins.h
@@ -129,7 +129,7 @@ private:
protected:
// Engine APIs
virtual Common::Error run();
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
GUI::Debugger *getDebugger() { return _debug; }
diff --git a/engines/hugo/detection.cpp b/engines/hugo/detection.cpp
index 88911cd..69d9b93 100644
--- a/engines/hugo/detection.cpp
+++ b/engines/hugo/detection.cpp
@@ -149,7 +149,7 @@ public:
}
bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const;
- bool hasFeature(MetaEngineFeature f) const;
+ bool hasFeature(MetaEngineFeature f) const override;
int getMaximumSaveSlot() const;
SaveStateList listSaves(const char *target) const;
diff --git a/engines/hugo/hugo.h b/engines/hugo/hugo.h
index 85209af..bec1967 100644
--- a/engines/hugo/hugo.h
+++ b/engines/hugo/hugo.h
@@ -287,7 +287,7 @@ public:
void setMaxScore(const int newScore);
Common::Error saveGameState(int slot, const Common::String &desc);
Common::Error loadGameState(int slot);
- bool hasFeature(EngineFeature f) const;
+ bool hasFeature(EngineFeature f) const override;
const char *getCopyrightString() const;
Common::String getSavegameFilename(int slot);
diff --git a/engines/illusions/bbdou/illusions_bbdou.h b/engines/illusions/bbdou/illusions_bbdou.h
index f9311e1..bb562ad 100644
--- a/engines/illusions/bbdou/illusions_bbdou.h
+++ b/engines/illusions/bbdou/illusions_bbdou.h
@@ -63,7 +63,7 @@ public:
IllusionsEngine_BBDOU(OSystem *syst, const IllusionsGameDescription *gd);
protected:
virtual Common::Error run();
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
public:
ScriptMan *_scriptMan;
TriggerFunctions *_triggerFunctions;
diff --git a/engines/illusions/detection.cpp b/engines/illusions/detection.cpp
index 72c5620..d4ea987 100644
--- a/engines/illusions/detection.cpp
+++ b/engines/illusions/detection.cpp
@@ -130,7 +130,7 @@ public:
return "(C) The Illusions Gaming Company";
}
- virtual bool hasFeature(MetaEngineFeature f) const;
+ virtual bool hasFeature(MetaEngineFeature f) const override;
virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
virtual int getMaximumSaveSlot() const;
virtual SaveStateList listSaves(const char *target) const;
diff --git a/engines/illusions/duckman/illusions_duckman.h b/engines/illusions/duckman/illusions_duckman.h
index 0dfdf3a..91270ff 100644
--- a/engines/illusions/duckman/illusions_duckman.h
+++ b/engines/illusions/duckman/illusions_duckman.h
@@ -81,7 +81,7 @@ public:
IllusionsEngine_Duckman(OSystem *syst, const IllusionsGameDescription *gd);
protected:
virtual Common::Error run();
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
public:
uint32 _prevSceneId;
diff --git a/engines/kyra/kyra_v1.h b/engines/kyra/kyra_v1.h
index 1f15f0e..a96244e 100644
--- a/engines/kyra/kyra_v1.h
+++ b/engines/kyra/kyra_v1.h
@@ -257,7 +257,7 @@ protected:
}
virtual ::GUI::Debugger *getDebugger();
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
virtual void pauseEngineIntern(bool pause);
// intern
diff --git a/engines/lab/detection.cpp b/engines/lab/detection.cpp
index a2570f6..e75078d 100644
--- a/engines/lab/detection.cpp
+++ b/engines/lab/detection.cpp
@@ -138,7 +138,7 @@ public:
return true;
}
- virtual bool hasFeature(MetaEngineFeature f) const;
+ virtual bool hasFeature(MetaEngineFeature f) const override;
SaveStateList listSaves(const char *target) const;
virtual int getMaximumSaveSlot() const;
void removeSaveState(const char *target, int slot) const;
diff --git a/engines/lab/lab.h b/engines/lab/lab.h
index aedf018..b0d2f51 100644
--- a/engines/lab/lab.h
+++ b/engines/lab/lab.h
@@ -213,7 +213,7 @@ public:
Common::Platform getPlatform() const;
uint32 getFeatures() const;
- bool hasFeature(EngineFeature f) const;
+ bool hasFeature(EngineFeature f) const override;
Common::String generateSaveFileName(uint slot);
void changeVolume(int delta);
diff --git a/engines/lastexpress/lastexpress.h b/engines/lastexpress/lastexpress.h
index 0edd325..e61723f 100644
--- a/engines/lastexpress/lastexpress.h
+++ b/engines/lastexpress/lastexpress.h
@@ -71,7 +71,7 @@ class LastExpressEngine : public Engine {
protected:
// Engine APIs
Common::Error run();
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
virtual Debugger *getDebugger() { return _debugger; }
public:
diff --git a/engines/lilliput/detection.cpp b/engines/lilliput/detection.cpp
index 6ecb8f9..26a4215 100644
--- a/engines/lilliput/detection.cpp
+++ b/engines/lilliput/detection.cpp
@@ -139,7 +139,7 @@ public:
}
bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const;
- bool hasFeature(MetaEngineFeature f) const;
+ bool hasFeature(MetaEngineFeature f) const override;
int getMaximumSaveSlot() const;
SaveStateList listSaves(const char *target) const;
diff --git a/engines/lilliput/lilliput.h b/engines/lilliput/lilliput.h
index cb4e43c..b9ad24a 100644
--- a/engines/lilliput/lilliput.h
+++ b/engines/lilliput/lilliput.h
@@ -323,7 +323,7 @@ public:
GameType getGameType() const;
Common::Platform getPlatform() const;
- bool hasFeature(EngineFeature f) const;
+ bool hasFeature(EngineFeature f) const override;
const char *getCopyrightString() const;
Common::String getSavegameFilename(int slot);
diff --git a/engines/lure/detection.cpp b/engines/lure/detection.cpp
index be62b5b..093d010 100644
--- a/engines/lure/detection.cpp
+++ b/engines/lure/detection.cpp
@@ -259,7 +259,7 @@ public:
return "Lure of the Temptress (C) Revolution";
}
- virtual bool hasFeature(MetaEngineFeature f) const;
+ virtual bool hasFeature(MetaEngineFeature f) const override;
virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
virtual SaveStateList listSaves(const char *target) const;
virtual int getMaximumSaveSlot() const;
diff --git a/engines/lure/lure.h b/engines/lure/lure.h
index dd9fb18..b3008ff 100644
--- a/engines/lure/lure.h
+++ b/engines/lure/lure.h
@@ -99,7 +99,7 @@ public:
return err;
return go();
}
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
virtual void syncSoundSettings();
virtual void pauseEngineIntern(bool pause);
diff --git a/engines/macventure/macventure.h b/engines/macventure/macventure.h
index 3f2c181..69fe659 100644
--- a/engines/macventure/macventure.h
+++ b/engines/macventure/macventure.h
@@ -192,7 +192,7 @@ public:
MacVentureEngine(OSystem *syst, const ADGameDescription *gameDesc);
~MacVentureEngine();
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
virtual Common::Error run();
diff --git a/engines/made/made.h b/engines/made/made.h
index bd9b96b..32713c0 100644
--- a/engines/made/made.h
+++ b/engines/made/made.h
@@ -78,7 +78,7 @@ public:
MadeEngine(OSystem *syst, const MadeGameDescription *gameDesc);
virtual ~MadeEngine();
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
virtual void syncSoundSettings();
virtual GUI::Debugger *getDebugger();
diff --git a/engines/mads/detection.cpp b/engines/mads/detection.cpp
index 3f0f8e5..b968a7d 100644
--- a/engines/mads/detection.cpp
+++ b/engines/mads/detection.cpp
@@ -171,7 +171,7 @@ public:
return "MADS (C) Microprose";
}
- virtual bool hasFeature(MetaEngineFeature f) const;
+ virtual bool hasFeature(MetaEngineFeature f) const override;
virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
virtual SaveStateList listSaves(const char *target) const;
virtual int getMaximumSaveSlot() const;
diff --git a/engines/mads/mads.h b/engines/mads/mads.h
index 52f71f7..fe7dfec 100644
--- a/engines/mads/mads.h
+++ b/engines/mads/mads.h
@@ -90,7 +90,7 @@ private:
protected:
// Engine APIs
virtual Common::Error run();
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
public:
Debugger *_debugger;
Dialogs *_dialogs;
diff --git a/engines/mortevielle/detection.cpp b/engines/mortevielle/detection.cpp
index f941829..bcf64bb 100644
--- a/engines/mortevielle/detection.cpp
+++ b/engines/mortevielle/detection.cpp
@@ -73,7 +73,7 @@ public:
}
virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
- virtual bool hasFeature(MetaEngineFeature f) const;
+ virtual bool hasFeature(MetaEngineFeature f) const override;
virtual int getMaximumSaveSlot() const;
virtual SaveStateList listSaves(const char *target) const;
virtual SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const;
diff --git a/engines/mortevielle/mortevielle.h b/engines/mortevielle/mortevielle.h
index 5d00547..4cc681f 100644
--- a/engines/mortevielle/mortevielle.h
+++ b/engines/mortevielle/mortevielle.h
@@ -439,7 +439,7 @@ public:
MortevielleEngine(OSystem *system, const MortevielleGameDescription *gameDesc);
~MortevielleEngine();
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
virtual bool canLoadGameStateCurrently();
virtual bool canSaveGameStateCurrently();
virtual Common::Error loadGameState(int slot);
diff --git a/engines/neverhood/detection.cpp b/engines/neverhood/detection.cpp
index 0d4a727..dff01e1 100644
--- a/engines/neverhood/detection.cpp
+++ b/engines/neverhood/detection.cpp
@@ -213,7 +213,7 @@ public:
return "The Neverhood Chronicles (C) The Neverhood, Inc.";
}
- virtual bool hasFeature(MetaEngineFeature f) const;
+ virtual bool hasFeature(MetaEngineFeature f) const override;
virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
virtual const ExtraGuiOptions getExtraGuiOptions(const Common::String &target) const;
SaveStateList listSaves(const char *target) const;
diff --git a/engines/neverhood/neverhood.h b/engines/neverhood/neverhood.h
index 90055ee..cb50e25 100644
--- a/engines/neverhood/neverhood.h
+++ b/engines/neverhood/neverhood.h
@@ -73,7 +73,7 @@ public:
uint16 getVersion() const;
Common::Platform getPlatform() const;
Common::Language getLanguage() const;
- bool hasFeature(EngineFeature f) const;
+ bool hasFeature(EngineFeature f) const override;
bool isDemo() const;
bool applyResourceFixes() const;
Common::String getTargetName() { return _targetName; };
diff --git a/engines/parallaction/detection.cpp b/engines/parallaction/detection.cpp
index 2d0d3b8..6210352 100644
--- a/engines/parallaction/detection.cpp
+++ b/engines/parallaction/detection.cpp
@@ -234,7 +234,7 @@ public:
return "Nippon Safes Inc. (C) Dynabyte";
}
- virtual bool hasFeature(MetaEngineFeature f) const;
+ virtual bool hasFeature(MetaEngineFeature f) const override;
virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
virtual SaveStateList listSaves(const char *target) const;
virtual int getMaximumSaveSlot() const;
diff --git a/engines/parallaction/parallaction.h b/engines/parallaction/parallaction.h
index 6eb0106..e9026d6 100644
--- a/engines/parallaction/parallaction.h
+++ b/engines/parallaction/parallaction.h
@@ -271,7 +271,7 @@ public:
return go();
}
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
virtual void pauseEngineIntern(bool pause);
virtual GUI::Debugger *getDebugger();
diff --git a/engines/pegasus/pegasus.h b/engines/pegasus/pegasus.h
index 3e41181..09c9a7f 100644
--- a/engines/pegasus/pegasus.h
+++ b/engines/pegasus/pegasus.h
@@ -77,7 +77,7 @@ public:
// Engine stuff
const PegasusGameDescription *_gameDescription;
- bool hasFeature(EngineFeature f) const;
+ bool hasFeature(EngineFeature f) const override;
GUI::Debugger *getDebugger();
bool canLoadGameStateCurrently();
bool canSaveGameStateCurrently();
diff --git a/engines/pink/detection.cpp b/engines/pink/detection.cpp
index c57c81b..b9243c7 100644
--- a/engines/pink/detection.cpp
+++ b/engines/pink/detection.cpp
@@ -68,7 +68,7 @@ public:
return "Pink Panther (C) Wanderlust Interactive";
}
- virtual bool hasFeature(MetaEngineFeature f) const;
+ virtual bool hasFeature(MetaEngineFeature f) const override;
virtual int getMaximumSaveSlot() const { return 99; }
virtual SaveStateList listSaves(const char *target) const;
virtual void removeSaveState(const char *target, int slot) const;
diff --git a/engines/plumbers/detection.cpp b/engines/plumbers/detection.cpp
index 57cd439..30d28d9 100644
--- a/engines/plumbers/detection.cpp
+++ b/engines/plumbers/detection.cpp
@@ -85,7 +85,7 @@ public:
return "Plumbers Don't Wear Ties (C) 1993-94 Kirin Entertainment";
}
- virtual bool hasFeature(MetaEngineFeature f) const;
+ virtual bool hasFeature(MetaEngineFeature f) const override;
virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
};
diff --git a/engines/prince/detection.cpp b/engines/prince/detection.cpp
index 5390e36..47e15ea 100644
--- a/engines/prince/detection.cpp
+++ b/engines/prince/detection.cpp
@@ -165,7 +165,7 @@ public:
}
virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
- virtual bool hasFeature(MetaEngineFeature f) const;
+ virtual bool hasFeature(MetaEngineFeature f) const override;
virtual int getMaximumSaveSlot() const { return 99; }
virtual SaveStateList listSaves(const char *target) const;
SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const;
diff --git a/engines/prince/prince.h b/engines/prince/prince.h
index 9048bd5..a6c5a12 100644
--- a/engines/prince/prince.h
+++ b/engines/prince/prince.h
@@ -281,7 +281,7 @@ public:
bool scummVMSaveLoadDialog(bool isSave);
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
virtual void pauseEngineIntern(bool pause);
virtual bool canSaveGameStateCurrently();
virtual bool canLoadGameStateCurrently();
diff --git a/engines/queen/queen.h b/engines/queen/queen.h
index 411fdf9..5f2b8cf 100644
--- a/engines/queen/queen.h
+++ b/engines/queen/queen.h
@@ -121,7 +121,7 @@ protected:
// Engine APIs
virtual Common::Error run();
virtual GUI::Debugger *getDebugger();
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
virtual void syncSoundSettings();
diff --git a/engines/saga/detection.cpp b/engines/saga/detection.cpp
index ed8d7cd..ea3bb33 100644
--- a/engines/saga/detection.cpp
+++ b/engines/saga/detection.cpp
@@ -124,7 +124,7 @@ public:
return "Inherit the Earth (C) Wyrmkeep Entertainment";
}
- virtual bool hasFeature(MetaEngineFeature f) const;
+ virtual bool hasFeature(MetaEngineFeature f) const override;
virtual Common::Error createInstance(OSystem *syst, Engine **engine) const {
return AdvancedMetaEngine::createInstance(syst, engine);
diff --git a/engines/saga/saga.h b/engines/saga/saga.h
index db581f2..2923408 100644
--- a/engines/saga/saga.h
+++ b/engines/saga/saga.h
@@ -467,7 +467,7 @@ class SagaEngine : public Engine {
public:
// Engine APIs
virtual Common::Error run();
- bool hasFeature(EngineFeature f) const;
+ bool hasFeature(EngineFeature f) const override;
void syncSoundSettings();
void pauseEngineIntern(bool pause);
diff --git a/engines/sci/sci.h b/engines/sci/sci.h
index 94dfb1d..087aab5 100644
--- a/engines/sci/sci.h
+++ b/engines/sci/sci.h
@@ -255,7 +255,7 @@ public:
// Engine APIs
virtual Common::Error run();
- bool hasFeature(EngineFeature f) const;
+ bool hasFeature(EngineFeature f) const override;
void pauseEngineIntern(bool pause);
virtual GUI::Debugger *getDebugger();
Console *getSciDebugger();
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h
index 958b6d8..019ff1e 100644
--- a/engines/scumm/scumm.h
+++ b/engines/scumm/scumm.h
@@ -430,7 +430,7 @@ public:
}
virtual void errorString(const char *buf_input, char *buf_output, int buf_output_size);
virtual GUI::Debugger *getDebugger();
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
virtual void syncSoundSettings();
virtual Common::Error loadGameState(int slot);
diff --git a/engines/sherlock/detection.cpp b/engines/sherlock/detection.cpp
index b54b706..847681c 100644
--- a/engines/sherlock/detection.cpp
+++ b/engines/sherlock/detection.cpp
@@ -171,7 +171,7 @@ public:
/**
* Returns a list of features the game's MetaEngine support
*/
- virtual bool hasFeature(MetaEngineFeature f) const;
+ virtual bool hasFeature(MetaEngineFeature f) const override;
/**
* Return a list of savegames
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index 0b4333e..d729bb4 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -103,7 +103,7 @@ protected:
/**
* Returns a list of features the game itself supports
*/
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
/**
* Load game configuration esttings
diff --git a/engines/sky/sky.h b/engines/sky/sky.h
index 374302b..36bcc7c 100644
--- a/engines/sky/sky.h
+++ b/engines/sky/sky.h
@@ -108,7 +108,7 @@ protected:
return go();
}
virtual GUI::Debugger *getDebugger();
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
byte _fastMode;
diff --git a/engines/startrek/detection.cpp b/engines/startrek/detection.cpp
index 4135481..c1fcb60 100644
--- a/engines/startrek/detection.cpp
+++ b/engines/startrek/detection.cpp
@@ -334,7 +334,7 @@ public:
return "Star Trek: 25th Anniversary, Star Trek: Judgment Rites (C) Interplay";
}
- virtual bool hasFeature(MetaEngineFeature f) const;
+ virtual bool hasFeature(MetaEngineFeature f) const override;
virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
virtual SaveStateList listSaves(const char *target) const;
diff --git a/engines/supernova/detection.cpp b/engines/supernova/detection.cpp
index c511c2a..add4c67 100644
--- a/engines/supernova/detection.cpp
+++ b/engines/supernova/detection.cpp
@@ -114,7 +114,7 @@ public:
return "Mission Supernova (C) 1994 Thomas and Steffen Dingel";
}
- virtual bool hasFeature(MetaEngineFeature f) const;
+ virtual bool hasFeature(MetaEngineFeature f) const override;
virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
virtual SaveStateList listSaves(const char *target) const;
virtual void removeSaveState(const char *target, int slot) const;
diff --git a/engines/supernova/supernova.h b/engines/supernova/supernova.h
index 8139d5f..8e51a35 100644
--- a/engines/supernova/supernova.h
+++ b/engines/supernova/supernova.h
@@ -69,7 +69,7 @@ public:
virtual bool canLoadGameStateCurrently();
virtual Common::Error saveGameState(int slot, const Common::String &desc);
virtual bool canSaveGameStateCurrently();
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
virtual void pauseEngineIntern(bool pause);
GameManager *_gm;
diff --git a/engines/sword1/sword1.h b/engines/sword1/sword1.h
index 32375e9..ae22bff 100644
--- a/engines/sword1/sword1.h
+++ b/engines/sword1/sword1.h
@@ -105,7 +105,7 @@ protected:
return err;
return go();
}
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
virtual void syncSoundSettings();
GUI::Debugger *getDebugger() { return _console; }
diff --git a/engines/sword2/sword2.h b/engines/sword2/sword2.h
index 65d1a95..5e17f34 100644
--- a/engines/sword2/sword2.h
+++ b/engines/sword2/sword2.h
@@ -144,7 +144,7 @@ protected:
// Engine APIs
virtual Common::Error run();
virtual GUI::Debugger *getDebugger();
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
virtual void syncSoundSettings();
virtual void pauseEngineIntern(bool pause);
diff --git a/engines/sword25/detection.cpp b/engines/sword25/detection.cpp
index 44e3f34..515a05e 100644
--- a/engines/sword25/detection.cpp
+++ b/engines/sword25/detection.cpp
@@ -70,7 +70,7 @@ public:
}
virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
- virtual bool hasFeature(MetaEngineFeature f) const;
+ virtual bool hasFeature(MetaEngineFeature f) const override;
virtual const ExtraGuiOptions getExtraGuiOptions(const Common::String &target) const;
virtual int getMaximumSaveSlot() const { return Sword25::PersistenceService::getSlotCount(); }
virtual SaveStateList listSaves(const char *target) const;
diff --git a/engines/sword25/sword25.h b/engines/sword25/sword25.h
index c08f20e..0c7bf86 100644
--- a/engines/sword25/sword25.h
+++ b/engines/sword25/sword25.h
@@ -78,7 +78,7 @@ private:
protected:
virtual Common::Error run();
- bool hasFeature(EngineFeature f) const;
+ bool hasFeature(EngineFeature f) const override;
// void pauseEngineIntern(bool pause); // TODO: Implement this!!!
// void syncSoundSettings(); // TODO: Implement this!!!
// Common::Error loadGameState(int slot); // TODO: Implement this?
diff --git a/engines/teenagent/teenagent.h b/engines/teenagent/teenagent.h
index f33c684..255e052 100644
--- a/engines/teenagent/teenagent.h
+++ b/engines/teenagent/teenagent.h
@@ -91,7 +91,7 @@ public:
virtual Common::Error saveGameState(int slot, const Common::String &desc);
virtual bool canLoadGameStateCurrently() { return true; }
virtual bool canSaveGameStateCurrently() { return !_sceneBusy; }
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
GUI::Debugger *getDebugger() { return console; }
diff --git a/engines/testbed/testbed.h b/engines/testbed/testbed.h
index 5ea05fe..df007d4 100644
--- a/engines/testbed/testbed.h
+++ b/engines/testbed/testbed.h
@@ -52,7 +52,7 @@ public:
*/
void invokeTestsuites(TestbedConfigManager &cfMan);
- bool hasFeature(EngineFeature f) const;
+ bool hasFeature(EngineFeature f) const override;
private:
Common::Array<Testsuite *> _testsuiteList;
diff --git a/engines/tinsel/tinsel.h b/engines/tinsel/tinsel.h
index 9e4ce61..815d3f3 100644
--- a/engines/tinsel/tinsel.h
+++ b/engines/tinsel/tinsel.h
@@ -163,7 +163,7 @@ protected:
// Engine APIs
virtual void initializePath(const Common::FSNode &gamePath);
virtual Common::Error run();
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
Common::Error loadGameState(int slot);
#if 0
Common::Error saveGameState(int slot, const Common::String &desc);
diff --git a/engines/titanic/detection.cpp b/engines/titanic/detection.cpp
index e4e8f5a..2b7252c 100644
--- a/engines/titanic/detection.cpp
+++ b/engines/titanic/detection.cpp
@@ -74,7 +74,7 @@ public:
return "Starship Titanic (C) The Digital Village";
}
- virtual bool hasFeature(MetaEngineFeature f) const;
+ virtual bool hasFeature(MetaEngineFeature f) const override;
virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
virtual SaveStateList listSaves(const char *target) const;
virtual int getMaximumSaveSlot() const;
diff --git a/engines/titanic/titanic.h b/engines/titanic/titanic.h
index a796719..4b4e1e0 100644
--- a/engines/titanic/titanic.h
+++ b/engines/titanic/titanic.h
@@ -107,7 +107,7 @@ protected:
// Engine APIs
virtual void initializePath(const Common::FSNode &gamePath);
virtual Common::Error run();
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
public:
Debugger *_debugger;
Events *_events;
diff --git a/engines/toltecs/detection.cpp b/engines/toltecs/detection.cpp
index 7f7b3db..3937495 100644
--- a/engines/toltecs/detection.cpp
+++ b/engines/toltecs/detection.cpp
@@ -248,7 +248,7 @@ public:
return "3 Skulls of the Toltecs (C) Revistronic 1996";
}
- virtual bool hasFeature(MetaEngineFeature f) const;
+ virtual bool hasFeature(MetaEngineFeature f) const override;
virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
virtual const ExtraGuiOptions getExtraGuiOptions(const Common::String &target) const;
SaveStateList listSaves(const char *target) const;
diff --git a/engines/toltecs/toltecs.h b/engines/toltecs/toltecs.h
index 1c9e936..dea22ab 100644
--- a/engines/toltecs/toltecs.h
+++ b/engines/toltecs/toltecs.h
@@ -103,7 +103,7 @@ public:
ToltecsEngine(OSystem *syst, const ToltecsGameDescription *gameDesc);
virtual ~ToltecsEngine();
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
Common::RandomSource *_rnd;
const ToltecsGameDescription *_gameDescription;
diff --git a/engines/tony/detection.cpp b/engines/tony/detection.cpp
index 62e6a17..9ae77f0 100644
--- a/engines/tony/detection.cpp
+++ b/engines/tony/detection.cpp
@@ -83,7 +83,7 @@ public:
return "Tony Tough and the Night of Roasted Moths (C) Protonic Interactive";
}
- virtual bool hasFeature(MetaEngineFeature f) const;
+ virtual bool hasFeature(MetaEngineFeature f) const override;
virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
virtual SaveStateList listSaves(const char *target) const;
virtual int getMaximumSaveSlot() const;
diff --git a/engines/tony/tony.h b/engines/tony/tony.h
index cb9f5fe..f3ada4f 100644
--- a/engines/tony/tony.h
+++ b/engines/tony/tony.h
@@ -96,7 +96,7 @@ private:
protected:
// Engine APIs
virtual Common::Error run();
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
public:
LPCUSTOMFUNCTION _funcList[300];
Common::String _funcListStrings[300];
diff --git a/engines/touche/touche.h b/engines/touche/touche.h
index be63673..e1cede3 100644
--- a/engines/touche/touche.h
+++ b/engines/touche/touche.h
@@ -473,7 +473,7 @@ public:
// Engine APIs
virtual Common::Error run();
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
virtual void syncSoundSettings();
GUI::Debugger *getDebugger() { return _console; }
diff --git a/engines/tsage/tsage.h b/engines/tsage/tsage.h
index ca29d68..02cb84e 100644
--- a/engines/tsage/tsage.h
+++ b/engines/tsage/tsage.h
@@ -65,7 +65,7 @@ private:
public:
TSageEngine(OSystem *system, const tSageGameDescription *gameDesc);
~TSageEngine();
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
MemoryManager _memoryManager;
Debugger *_debugger;
diff --git a/engines/tucker/tucker.h b/engines/tucker/tucker.h
index 6ed3270..f4760ae 100644
--- a/engines/tucker/tucker.h
+++ b/engines/tucker/tucker.h
@@ -449,7 +449,7 @@ public:
virtual ~TuckerEngine();
virtual Common::Error run();
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
GUI::Debugger *getDebugger() { return _console; }
WARN_UNUSED_RESULT static SavegameError readSavegameHeader(Common::InSaveFile *file, SavegameHeader &header, bool skipThumbnail = true);
diff --git a/engines/voyeur/detection.cpp b/engines/voyeur/detection.cpp
index 287dbfe..6ef04bb 100644
--- a/engines/voyeur/detection.cpp
+++ b/engines/voyeur/detection.cpp
@@ -82,7 +82,7 @@ public:
return "Voyeur (C) Philips P.O.V. Entertainment Group";
}
- virtual bool hasFeature(MetaEngineFeature f) const;
+ virtual bool hasFeature(MetaEngineFeature f) const override;
virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
virtual SaveStateList listSaves(const char *target) const;
virtual int getMaximumSaveSlot() const;
diff --git a/engines/voyeur/voyeur.h b/engines/voyeur/voyeur.h
index a098ba9..081b73d 100644
--- a/engines/voyeur/voyeur.h
+++ b/engines/voyeur/voyeur.h
@@ -158,7 +158,7 @@ private:
protected:
// Engine APIs
virtual Common::Error run();
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
public:
BoltFile *_bVoy;
Debugger *_debugger;
diff --git a/engines/wage/detection.cpp b/engines/wage/detection.cpp
index 49a01f8..246bcc7 100644
--- a/engines/wage/detection.cpp
+++ b/engines/wage/detection.cpp
@@ -72,7 +72,7 @@ public:
}
virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
- virtual bool hasFeature(MetaEngineFeature f) const;
+ virtual bool hasFeature(MetaEngineFeature f) const override;
virtual SaveStateList listSaves(const char *target) const;
virtual int getMaximumSaveSlot() const;
virtual void removeSaveState(const char *target, int slot) const;
diff --git a/engines/wage/wage.h b/engines/wage/wage.h
index cb4e8a3..ee3ef0f 100644
--- a/engines/wage/wage.h
+++ b/engines/wage/wage.h
@@ -116,7 +116,7 @@ public:
WageEngine(OSystem *syst, const ADGameDescription *gameDesc);
~WageEngine();
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
virtual Common::Error run();
diff --git a/engines/wintermute/wintermute.h b/engines/wintermute/wintermute.h
index fcf4f95..ba7b3a8 100644
--- a/engines/wintermute/wintermute.h
+++ b/engines/wintermute/wintermute.h
@@ -62,7 +62,7 @@ public:
void trigDebugger() { _trigDebug = true; }
virtual Common::Error run();
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
Common::SaveFileManager *getSaveFileMan() { return _saveFileMan; }
virtual Common::Error loadGameState(int slot);
virtual bool canLoadGameStateCurrently();
diff --git a/engines/xeen/detection.cpp b/engines/xeen/detection.cpp
index 45490f3..447f0af 100644
--- a/engines/xeen/detection.cpp
+++ b/engines/xeen/detection.cpp
@@ -132,7 +132,7 @@ public:
return "Xeen (C) 1992-1993 New World Computing, Inc.";
}
- virtual bool hasFeature(MetaEngineFeature f) const;
+ virtual bool hasFeature(MetaEngineFeature f) const override;
virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
virtual SaveStateList listSaves(const char *target) const;
virtual int getMaximumSaveSlot() const;
diff --git a/engines/xeen/xeen.h b/engines/xeen/xeen.h
index 2f231c5..70b976d 100644
--- a/engines/xeen/xeen.h
+++ b/engines/xeen/xeen.h
@@ -132,7 +132,7 @@ private:
// Engine APIs
virtual Common::Error run();
- virtual bool hasFeature(EngineFeature f) const;
+ virtual bool hasFeature(EngineFeature f) const override;
/**
* Outer gameplay loop responsible for dispatching control to game-specific
diff --git a/engines/zvision/detection.cpp b/engines/zvision/detection.cpp
index 1ce9871..d515f8c 100644
--- a/engines/zvision/detection.cpp
+++ b/engines/zvision/detection.cpp
@@ -75,7 +75,7 @@ public:
return "Z-Vision (C) 1996 Activision";
}
- virtual bool hasFeature(MetaEngineFeature f) const;
+ virtual bool hasFeature(MetaEngineFeature f) const override;
virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
SaveStateList listSaves(const char *target) const;
virtual int getMaximumSaveSlot() const;
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index 0044532..f599eaf 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -240,7 +240,7 @@ public:
bool ifQuit();
// Engine features
- bool hasFeature(EngineFeature f) const;
+ bool hasFeature(EngineFeature f) const override;
bool canLoadGameStateCurrently();
bool canSaveGameStateCurrently();
Common::Error loadGameState(int slot);
More information about the Scummvm-git-logs
mailing list