[Scummvm-git-logs] scummvm master -> 445c77007d8b91bf7e7445c3f45ff535df0398e1
sev-
sev at scummvm.org
Thu Feb 6 22:47:12 UTC 2020
This automated email contains information about 16 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
d151f157f6 SWORD2: Added override keywords
c79fb58186 SWORD25: Added override keywords
7dde997b31 TEENAGENT: Added override keywords
cfde7683e7 TESTBED: Added override keywords
c40b96f5ae TINSEL: Added override keywords
0aaba0b3b8 TITANIC: Added override keywords
4ba1ce7f23 TOLTECS: Added override keywords
40684a2111 TONY: Added override keywords
f45439add5 TOUCHE: Added override keywords
07d3918387 TSAGE: Added override keywords
c9da2585aa TUCKER: Added override keywords
25ffcd9cf9 VOYEUR: Added override keywords
9fe1fa41c7 WAGE: Added override keywords
58b50be431 WINTERMUTE: Added override keywords
78cc55c4b0 XEEN: Added override keywords
445c77007d ZVISION: Added override keywords
Commit: d151f157f6281770aab418f771177d710d1aee1c
https://github.com/scummvm/scummvm/commit/d151f157f6281770aab418f771177d710d1aee1c
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-06T23:46:47+01:00
Commit Message:
SWORD2: Added override keywords
Changed paths:
engines/sword2/sword2.h
diff --git a/engines/sword2/sword2.h b/engines/sword2/sword2.h
index 5e17f34..74c99e3 100644
--- a/engines/sword2/sword2.h
+++ b/engines/sword2/sword2.h
@@ -142,11 +142,11 @@ private:
protected:
// Engine APIs
- virtual Common::Error run();
- virtual GUI::Debugger *getDebugger();
+ virtual Common::Error run() override;
+ virtual GUI::Debugger *getDebugger() override;
virtual bool hasFeature(EngineFeature f) const override;
- virtual void syncSoundSettings();
- virtual void pauseEngineIntern(bool pause);
+ virtual void syncSoundSettings() override;
+ virtual void pauseEngineIntern(bool pause) override;
public:
Sword2Engine(OSystem *syst);
@@ -164,10 +164,10 @@ public:
void setSubtitles(bool b) { _useSubtitles = b; }
// GMM Loading/Saving
- Common::Error saveGameState(int slot, const Common::String &desc);
- bool canSaveGameStateCurrently();
- Common::Error loadGameState(int slot);
- bool canLoadGameStateCurrently();
+ Common::Error saveGameState(int slot, const Common::String &desc) override;
+ bool canSaveGameStateCurrently() override;
+ Common::Error loadGameState(int slot) override;
+ bool canLoadGameStateCurrently() override;
uint32 _features;
Commit: c79fb58186b30f5aff8b2e16123d1c562902d25a
https://github.com/scummvm/scummvm/commit/c79fb58186b30f5aff8b2e16123d1c562902d25a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-06T23:46:47+01:00
Commit Message:
SWORD25: Added override keywords
Changed paths:
engines/sword25/detection.cpp
engines/sword25/sword25.h
diff --git a/engines/sword25/detection.cpp b/engines/sword25/detection.cpp
index 515a05e..23aeb23 100644
--- a/engines/sword25/detection.cpp
+++ b/engines/sword25/detection.cpp
@@ -57,23 +57,23 @@ public:
_directoryGlobs = directoryGlobs;
}
- const char *getEngineId() const {
+ const char *getEngineId() const override {
return "sword25";
}
- virtual const char *getName() const {
+ virtual const char *getName() const override {
return "Broken Sword 2.5";
}
- virtual const char *getOriginalCopyright() const {
+ virtual const char *getOriginalCopyright() const override {
return "Broken Sword 2.5 (C) Malte Thiesen, Daniel Queteschiner and Michael Elsdorfer";
}
- virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
+ virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
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;
+ virtual const ExtraGuiOptions getExtraGuiOptions(const Common::String &target) const override;
+ virtual int getMaximumSaveSlot() const override { return Sword25::PersistenceService::getSlotCount(); }
+ virtual SaveStateList listSaves(const char *target) const override;
};
bool Sword25MetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
diff --git a/engines/sword25/sword25.h b/engines/sword25/sword25.h
index 0c7bf86..6ea7ef6 100644
--- a/engines/sword25/sword25.h
+++ b/engines/sword25/sword25.h
@@ -77,7 +77,7 @@ private:
Sword25Console *_console;
protected:
- virtual Common::Error run();
+ virtual Common::Error run() override;
bool hasFeature(EngineFeature f) const override;
// void pauseEngineIntern(bool pause); // TODO: Implement this!!!
// void syncSoundSettings(); // TODO: Implement this!!!
@@ -86,7 +86,7 @@ protected:
// bool canLoadGameStateCurrently(); // TODO: Implement this?
// bool canSaveGameStateCurrently(); // TODO: Implement this?
- GUI::Debugger *getDebugger() { return _console; }
+ GUI::Debugger *getDebugger() override { return _console; }
void shutdown();
Commit: 7dde997b31cc8509cc36a89a08b1ed0976d2915f
https://github.com/scummvm/scummvm/commit/7dde997b31cc8509cc36a89a08b1ed0976d2915f
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-06T23:46:47+01:00
Commit Message:
TEENAGENT: Added override keywords
Changed paths:
engines/teenagent/teenagent.h
diff --git a/engines/teenagent/teenagent.h b/engines/teenagent/teenagent.h
index 255e052..852d4a1 100644
--- a/engines/teenagent/teenagent.h
+++ b/engines/teenagent/teenagent.h
@@ -86,14 +86,14 @@ public:
TeenAgentEngine(OSystem *system, const ADGameDescription *gd);
~TeenAgentEngine();
- virtual Common::Error run();
- virtual Common::Error loadGameState(int slot);
- virtual Common::Error saveGameState(int slot, const Common::String &desc);
- virtual bool canLoadGameStateCurrently() { return true; }
- virtual bool canSaveGameStateCurrently() { return !_sceneBusy; }
+ virtual Common::Error run() override;
+ virtual Common::Error loadGameState(int slot) override;
+ virtual Common::Error saveGameState(int slot, const Common::String &desc) override;
+ virtual bool canLoadGameStateCurrently() override { return true; }
+ virtual bool canSaveGameStateCurrently() override { return !_sceneBusy; }
virtual bool hasFeature(EngineFeature f) const override;
- GUI::Debugger *getDebugger() { return console; }
+ GUI::Debugger *getDebugger() override { return console; }
void init();
Commit: cfde7683e7609e10fd5e1b4e5ad29b6fc466a49d
https://github.com/scummvm/scummvm/commit/cfde7683e7609e10fd5e1b4e5ad29b6fc466a49d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-06T23:46:47+01:00
Commit Message:
TESTBED: Added override keywords
Changed paths:
engines/testbed/testbed.h
diff --git a/engines/testbed/testbed.h b/engines/testbed/testbed.h
index df007d4..250f076 100644
--- a/engines/testbed/testbed.h
+++ b/engines/testbed/testbed.h
@@ -45,7 +45,7 @@ public:
TestbedEngine(OSystem *syst);
~TestbedEngine();
- virtual Common::Error run();
+ virtual Common::Error run() override;
/**
* Invokes configured testsuites.
Commit: c40b96f5aed4c798086315d206f2a70985b82b0a
https://github.com/scummvm/scummvm/commit/c40b96f5aed4c798086315d206f2a70985b82b0a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-06T23:46:47+01:00
Commit Message:
TINSEL: Added override keywords
Changed paths:
engines/tinsel/tinsel.h
diff --git a/engines/tinsel/tinsel.h b/engines/tinsel/tinsel.h
index 815d3f3..ff56aeb 100644
--- a/engines/tinsel/tinsel.h
+++ b/engines/tinsel/tinsel.h
@@ -152,7 +152,7 @@ class TinselEngine : public Engine {
Common::Point _mousePos;
uint8 _dosPlayerDir;
Console *_console;
- GUI::Debugger *getDebugger() { return _console; }
+ GUI::Debugger *getDebugger() override { return _console; }
static const char *const _sampleIndices[][3];
static const char *const _sampleFiles[][3];
@@ -161,14 +161,14 @@ class TinselEngine : public Engine {
protected:
// Engine APIs
- virtual void initializePath(const Common::FSNode &gamePath);
- virtual Common::Error run();
+ virtual void initializePath(const Common::FSNode &gamePath) override;
+ virtual Common::Error run() override;
virtual bool hasFeature(EngineFeature f) const override;
- Common::Error loadGameState(int slot);
+ Common::Error loadGameState(int slot) override;
#if 0
Common::Error saveGameState(int slot, const Common::String &desc);
#endif
- bool canLoadGameStateCurrently();
+ bool canLoadGameStateCurrently() override;
#if 0
bool canSaveGameStateCurrently();
#endif
Commit: 0aaba0b3b8ce36ac5bf254bad213194a6f302c56
https://github.com/scummvm/scummvm/commit/0aaba0b3b8ce36ac5bf254bad213194a6f302c56
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-06T23:46:47+01:00
Commit Message:
TITANIC: Added override keywords
Changed paths:
engines/titanic/detection.cpp
engines/titanic/titanic.h
diff --git a/engines/titanic/detection.cpp b/engines/titanic/detection.cpp
index 2b7252c..dc1ee84 100644
--- a/engines/titanic/detection.cpp
+++ b/engines/titanic/detection.cpp
@@ -62,24 +62,24 @@ public:
_maxScanDepth = 3;
}
- virtual const char *getEngineId() const {
+ virtual const char *getEngineId() const override {
return "titanic";
}
- virtual const char *getName() const {
+ virtual const char *getName() const override {
return "Starship Titanic";
}
- virtual const char *getOriginalCopyright() const {
+ virtual const char *getOriginalCopyright() const override {
return "Starship Titanic (C) The Digital Village";
}
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;
- virtual void removeSaveState(const char *target, int slot) const;
- SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const;
+ virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
+ virtual SaveStateList listSaves(const char *target) const override;
+ virtual int getMaximumSaveSlot() const override;
+ virtual void removeSaveState(const char *target, int slot) const override;
+ SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override;
};
bool TitanicMetaEngine::hasFeature(MetaEngineFeature f) const {
diff --git a/engines/titanic/titanic.h b/engines/titanic/titanic.h
index 4b4e1e0..6be44db 100644
--- a/engines/titanic/titanic.h
+++ b/engines/titanic/titanic.h
@@ -105,8 +105,8 @@ protected:
const TitanicGameDescription *_gameDescription;
// Engine APIs
- virtual void initializePath(const Common::FSNode &gamePath);
- virtual Common::Error run();
+ virtual void initializePath(const Common::FSNode &gamePath) override;
+ virtual Common::Error run() override;
virtual bool hasFeature(EngineFeature f) const override;
public:
Debugger *_debugger;
@@ -136,27 +136,27 @@ public:
/**
* Returns true if a savegame can be loaded
*/
- virtual bool canLoadGameStateCurrently();
+ virtual bool canLoadGameStateCurrently() override;
/**
* Returns true if the game can be saved
*/
- virtual bool canSaveGameStateCurrently();
+ virtual bool canSaveGameStateCurrently() override;
/**
* Called by the GMM to load a savegame
*/
- virtual Common::Error loadGameState(int slot);
+ virtual Common::Error loadGameState(int slot) override;
/**
* Called by the GMM to save the game
*/
- virtual Common::Error saveGameState(int slot, const Common::String &desc);
+ virtual Common::Error saveGameState(int slot, const Common::String &desc) override;
/**
* Handles updates to the sound levels
*/
- virtual void syncSoundSettings();
+ virtual void syncSoundSettings() override;
/**
* Gets the game features
@@ -181,7 +181,7 @@ public:
/**
* Returns a uniform random floating point number in the interval [0.0, 65535.0]
*/
- double getRandomFloat() { return getRandomNumber(0xfffffffe) * 0.00001525855623540901; } // fffffffe=4294967294 and 0.00001525855623540901 ~= 1/65537.0
+ double getRandomFloat() { return getRandomNumber(0xfffffffe) * 0.00001525855623540901; } // fffffffe=4294967294 and 0.00001525855623540901 ~= 1/65537.0
/**
* Support method that generates a savegame name
Commit: 4ba1ce7f231fb0a5b79ceb61a3d29a1b101ca4ce
https://github.com/scummvm/scummvm/commit/4ba1ce7f231fb0a5b79ceb61a3d29a1b101ca4ce
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-06T23:46:47+01:00
Commit Message:
TOLTECS: Added override keywords
Changed paths:
engines/toltecs/detection.cpp
engines/toltecs/toltecs.h
diff --git a/engines/toltecs/detection.cpp b/engines/toltecs/detection.cpp
index 3937495..2d08cd0 100644
--- a/engines/toltecs/detection.cpp
+++ b/engines/toltecs/detection.cpp
@@ -236,25 +236,25 @@ public:
ToltecsMetaEngine() : AdvancedMetaEngine(Toltecs::gameDescriptions, sizeof(Toltecs::ToltecsGameDescription), toltecsGames) {
}
- const char *getEngineId() const {
+ const char *getEngineId() const override {
return "toltecs";
}
- virtual const char *getName() const {
+ virtual const char *getName() const override {
return "3 Skulls of the Toltecs";
}
- virtual const char *getOriginalCopyright() const {
+ virtual const char *getOriginalCopyright() const override {
return "3 Skulls of the Toltecs (C) Revistronic 1996";
}
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;
- virtual int getMaximumSaveSlot() const;
- void removeSaveState(const char *target, int slot) const;
- SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const;
+ virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
+ virtual const ExtraGuiOptions getExtraGuiOptions(const Common::String &target) const override;
+ SaveStateList listSaves(const char *target) const override;
+ virtual int getMaximumSaveSlot() const override;
+ void removeSaveState(const char *target, int slot) const override;
+ SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override;
};
bool ToltecsMetaEngine::hasFeature(MetaEngineFeature f) const {
diff --git a/engines/toltecs/toltecs.h b/engines/toltecs/toltecs.h
index dea22ab..9751d61 100644
--- a/engines/toltecs/toltecs.h
+++ b/engines/toltecs/toltecs.h
@@ -96,7 +96,7 @@ class ToltecsEngine : public ::Engine {
Common::KeyState _keyPressed;
protected:
- Common::Error run();
+ Common::Error run() override;
// void shutdown();
public:
@@ -110,9 +110,9 @@ public:
uint32 getFeatures() const;
Common::Language getLanguage() const;
const Common::String& getTargetName() const { return _targetName; }
- void syncSoundSettings();
+ void syncSoundSettings() override;
- GUI::Debugger *getDebugger() { return _console; }
+ GUI::Debugger *getDebugger() override { return _console; }
void setupSysStrings();
void requestSavegame(int slotNum, Common::String &description);
@@ -215,10 +215,10 @@ public:
bool _isSaveAllowed;
- bool canLoadGameStateCurrently() { return _isSaveAllowed; }
- bool canSaveGameStateCurrently() { return _isSaveAllowed; }
- Common::Error loadGameState(int slot);
- Common::Error saveGameState(int slot, const Common::String &description);
+ bool canLoadGameStateCurrently() override { return _isSaveAllowed; }
+ bool canSaveGameStateCurrently() override { return _isSaveAllowed; }
+ Common::Error loadGameState(int slot) override;
+ Common::Error saveGameState(int slot, const Common::String &description) override;
void savegame(const char *filename, const char *description);
void loadgame(const char *filename);
Commit: 40684a2111c42704a9c994bd1525840f2ba5af73
https://github.com/scummvm/scummvm/commit/40684a2111c42704a9c994bd1525840f2ba5af73
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-06T23:46:47+01:00
Commit Message:
TONY: Added override keywords
Changed paths:
engines/tony/detection.cpp
engines/tony/tony.h
diff --git a/engines/tony/detection.cpp b/engines/tony/detection.cpp
index 9ae77f0..baa7bc4 100644
--- a/engines/tony/detection.cpp
+++ b/engines/tony/detection.cpp
@@ -71,24 +71,24 @@ public:
TonyMetaEngine() : AdvancedMetaEngine(Tony::gameDescriptions, sizeof(Tony::TonyGameDescription), tonyGames) {
}
- virtual const char *getEngineId() const {
+ virtual const char *getEngineId() const override {
return "tony";
}
- virtual const char *getName() const {
+ virtual const char *getName() const override {
return "Tony Tough and the Night of Roasted Moths";
}
- virtual const char *getOriginalCopyright() const {
+ virtual const char *getOriginalCopyright() const override {
return "Tony Tough and the Night of Roasted Moths (C) Protonic Interactive";
}
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;
- virtual void removeSaveState(const char *target, int slot) const;
- SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const;
+ virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
+ virtual SaveStateList listSaves(const char *target) const override;
+ virtual int getMaximumSaveSlot() const override;
+ virtual void removeSaveState(const char *target, int slot) const override;
+ SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override;
};
bool TonyMetaEngine::hasFeature(MetaEngineFeature f) const {
diff --git a/engines/tony/tony.h b/engines/tony/tony.h
index f3ada4f..fb419e3 100644
--- a/engines/tony/tony.h
+++ b/engines/tony/tony.h
@@ -95,7 +95,7 @@ private:
protected:
// Engine APIs
- virtual Common::Error run();
+ virtual Common::Error run() override;
virtual bool hasFeature(EngineFeature f) const override;
public:
LPCUSTOMFUNCTION _funcList[300];
@@ -110,7 +110,7 @@ public:
Common::List<FPSfx *> _activeSfx;
Globals _globals;
Debugger *_debugger;
- GUI::Debugger *getDebugger() { return _debugger; }
+ GUI::Debugger *getDebugger() override { return _debugger; }
int16 _cTableDialog[256];
int16 _lTableDialog[256];
@@ -164,10 +164,10 @@ public:
return &_theEngine;
}
- virtual bool canLoadGameStateCurrently();
- virtual bool canSaveGameStateCurrently();
- Common::Error loadGameState(int slot);
- Common::Error saveGameState(int slot, const Common::String &desc);
+ virtual bool canLoadGameStateCurrently() override;
+ virtual bool canSaveGameStateCurrently() override;
+ Common::Error loadGameState(int slot) override;
+ Common::Error saveGameState(int slot, const Common::String &desc) override;
void play();
void close();
@@ -230,7 +230,7 @@ public:
void openInitLoadMenu(CORO_PARAM);
void openInitOptions(CORO_PARAM);
- virtual void syncSoundSettings();
+ virtual void syncSoundSettings() override;
void saveSoundSettings();
};
Commit: f45439add5429ea0b06845282eb7586516e40e4d
https://github.com/scummvm/scummvm/commit/f45439add5429ea0b06845282eb7586516e40e4d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-06T23:46:47+01:00
Commit Message:
TOUCHE: Added override keywords
Changed paths:
engines/touche/touche.h
diff --git a/engines/touche/touche.h b/engines/touche/touche.h
index e1cede3..a355621 100644
--- a/engines/touche/touche.h
+++ b/engines/touche/touche.h
@@ -472,10 +472,10 @@ public:
virtual ~ToucheEngine();
// Engine APIs
- virtual Common::Error run();
+ virtual Common::Error run() override;
virtual bool hasFeature(EngineFeature f) const override;
- virtual void syncSoundSettings();
- GUI::Debugger *getDebugger() { return _console; }
+ virtual void syncSoundSettings() override;
+ GUI::Debugger *getDebugger() override { return _console; }
protected:
@@ -605,10 +605,10 @@ protected:
void saveGameStateData(Common::WriteStream *stream);
void loadGameStateData(Common::ReadStream *stream);
- virtual Common::Error saveGameState(int num, const Common::String &description);
- virtual Common::Error loadGameState(int num);
- virtual bool canLoadGameStateCurrently();
- virtual bool canSaveGameStateCurrently();
+ virtual Common::Error saveGameState(int num, const Common::String &description) override;
+ virtual Common::Error loadGameState(int num) override;
+ virtual bool canLoadGameStateCurrently() override;
+ virtual bool canSaveGameStateCurrently() override;
ToucheConsole *_console;
Commit: 07d39183876f36f5a94da79ab467ba7d28ea3924
https://github.com/scummvm/scummvm/commit/07d39183876f36f5a94da79ab467ba7d28ea3924
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-06T23:46:47+01:00
Commit Message:
TSAGE: Added override keywords
Changed paths:
engines/tsage/tsage.h
diff --git a/engines/tsage/tsage.h b/engines/tsage/tsage.h
index 02cb84e..f708881 100644
--- a/engines/tsage/tsage.h
+++ b/engines/tsage/tsage.h
@@ -69,7 +69,7 @@ public:
MemoryManager _memoryManager;
Debugger *_debugger;
- GUI::Debugger *getDebugger() { return _debugger; }
+ GUI::Debugger *getDebugger() override { return _debugger; }
const char *getGameId() const;
uint32 getGameID() const;
@@ -77,12 +77,12 @@ public:
Common::String getPrimaryFilename() const;
virtual Common::Error init();
- virtual Common::Error run();
- virtual bool canLoadGameStateCurrently();
- virtual bool canSaveGameStateCurrently();
- virtual Common::Error loadGameState(int slot);
- virtual Common::Error saveGameState(int slot, const Common::String &desc);
- virtual void syncSoundSettings();
+ virtual Common::Error run() override;
+ virtual bool canLoadGameStateCurrently() override;
+ virtual bool canSaveGameStateCurrently() override;
+ virtual Common::Error loadGameState(int slot) override;
+ virtual Common::Error saveGameState(int slot, const Common::String &desc) override;
+ virtual void syncSoundSettings() override;
Common::String generateSaveName(int slot);
void initialize();
Commit: c9da2585aad7c2b44fc9ef80ad3bdb076b4836b9
https://github.com/scummvm/scummvm/commit/c9da2585aad7c2b44fc9ef80ad3bdb076b4836b9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-06T23:46:47+01:00
Commit Message:
TUCKER: Added override keywords
Changed paths:
engines/tucker/tucker.h
diff --git a/engines/tucker/tucker.h b/engines/tucker/tucker.h
index f4760ae..d7127bf 100644
--- a/engines/tucker/tucker.h
+++ b/engines/tucker/tucker.h
@@ -448,9 +448,9 @@ public:
TuckerEngine(OSystem *system, Common::Language language, uint32 flags);
virtual ~TuckerEngine();
- virtual Common::Error run();
+ virtual Common::Error run() override;
virtual bool hasFeature(EngineFeature f) const override;
- GUI::Debugger *getDebugger() { return _console; }
+ GUI::Debugger *getDebugger() override { return _console; }
WARN_UNUSED_RESULT static SavegameError readSavegameHeader(Common::InSaveFile *file, SavegameHeader &header, bool skipThumbnail = true);
WARN_UNUSED_RESULT static SavegameError readSavegameHeader(const char *target, int slot, SavegameHeader &header);
@@ -743,14 +743,14 @@ protected:
void updateSprite_locationNum82(int i);
template<class S> SavegameError saveOrLoadGameStateData(S &s);
- virtual Common::Error loadGameState(int slot);
- virtual Common::Error saveGameState(int slot, const Common::String &description);
+ virtual Common::Error loadGameState(int slot) override;
+ virtual Common::Error saveGameState(int slot, const Common::String &description) override;
Common::Error writeSavegame(int slot, const Common::String &description, bool autosave = false);
SavegameError writeSavegameHeader(Common::OutSaveFile *file, SavegameHeader &header);
void writeAutosave();
bool canLoadOrSave() const;
- virtual bool canLoadGameStateCurrently();
- virtual bool canSaveGameStateCurrently();
+ virtual bool canLoadGameStateCurrently() override;
+ virtual bool canSaveGameStateCurrently() override;
virtual bool existsSavegame();
TuckerConsole *_console;
Commit: 25ffcd9cf942455944eba856a4bd4e9ac88d160b
https://github.com/scummvm/scummvm/commit/25ffcd9cf942455944eba856a4bd4e9ac88d160b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-06T23:46:47+01:00
Commit Message:
VOYEUR: Added override keywords
Changed paths:
engines/voyeur/detection.cpp
engines/voyeur/voyeur.h
diff --git a/engines/voyeur/detection.cpp b/engines/voyeur/detection.cpp
index 6ef04bb..66bcf04 100644
--- a/engines/voyeur/detection.cpp
+++ b/engines/voyeur/detection.cpp
@@ -70,24 +70,24 @@ public:
_maxScanDepth = 3;
}
- virtual const char *getEngineId() const {
+ virtual const char *getEngineId() const override {
return "voyeur";
}
- virtual const char *getName() const {
+ virtual const char *getName() const override {
return "Voyeur";
}
- virtual const char *getOriginalCopyright() const {
+ virtual const char *getOriginalCopyright() const override {
return "Voyeur (C) Philips P.O.V. Entertainment Group";
}
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;
- virtual void removeSaveState(const char *target, int slot) const;
- SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const;
+ virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
+ virtual SaveStateList listSaves(const char *target) const override;
+ virtual int getMaximumSaveSlot() const override;
+ virtual void removeSaveState(const char *target, int slot) const override;
+ SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override;
};
bool VoyeurMetaEngine::hasFeature(MetaEngineFeature f) const {
diff --git a/engines/voyeur/voyeur.h b/engines/voyeur/voyeur.h
index 081b73d..3937162 100644
--- a/engines/voyeur/voyeur.h
+++ b/engines/voyeur/voyeur.h
@@ -157,7 +157,7 @@ private:
void centerMansionView();
protected:
// Engine APIs
- virtual Common::Error run();
+ virtual Common::Error run() override;
virtual bool hasFeature(EngineFeature f) const override;
public:
BoltFile *_bVoy;
@@ -206,10 +206,10 @@ public:
int getRandomNumber(int maxNumber);
Common::String generateSaveName(int slotNumber);
- virtual bool canLoadGameStateCurrently();
- virtual bool canSaveGameStateCurrently();
- virtual Common::Error loadGameState(int slot);
- virtual Common::Error saveGameState(int slot, const Common::String &desc);
+ virtual bool canLoadGameStateCurrently() override;
+ virtual bool canSaveGameStateCurrently() override;
+ virtual Common::Error loadGameState(int slot) override;
+ virtual Common::Error saveGameState(int slot, const Common::String &desc) override;
void loadGame(int slot);
void playRL2Video(const Common::String &filename);
Commit: 9fe1fa41c77544af4b7a1bfb1c4f3c0b28990503
https://github.com/scummvm/scummvm/commit/9fe1fa41c77544af4b7a1bfb1c4f3c0b28990503
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-06T23:46:47+01:00
Commit Message:
WAGE: Added override keywords
Changed paths:
engines/wage/detection.cpp
engines/wage/wage.h
diff --git a/engines/wage/detection.cpp b/engines/wage/detection.cpp
index 246bcc7..5d176db 100644
--- a/engines/wage/detection.cpp
+++ b/engines/wage/detection.cpp
@@ -58,24 +58,23 @@ public:
_guiOptions = GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI);
}
- virtual const char *getEngineId() const {
+ virtual const char *getEngineId() const override {
return "wage";
}
-
- virtual const char *getName() const {
+ virtual const char *getName() const override {
return "World Adventure Game Engine";
}
- virtual const char *getOriginalCopyright() const {
+ virtual const char *getOriginalCopyright() const override {
return "World Builder (C) Silicon Beach Software";
}
- virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
+ virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
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;
+ virtual SaveStateList listSaves(const char *target) const override;
+ virtual int getMaximumSaveSlot() const override;
+ virtual void removeSaveState(const char *target, int slot) const override;
};
bool WageMetaEngine::hasFeature(MetaEngineFeature f) const {
diff --git a/engines/wage/wage.h b/engines/wage/wage.h
index ee3ef0f..b22ba31 100644
--- a/engines/wage/wage.h
+++ b/engines/wage/wage.h
@@ -118,10 +118,10 @@ public:
virtual bool hasFeature(EngineFeature f) const override;
- virtual Common::Error run();
+ virtual Common::Error run() override;
- bool canLoadGameStateCurrently();
- bool canSaveGameStateCurrently();
+ bool canLoadGameStateCurrently() override;
+ bool canSaveGameStateCurrently() override;
const char *getGameFile() const;
void processTurn(Common::String *textInput, Designed *clickInput);
@@ -212,8 +212,8 @@ public:
void redrawScene();
void saveGame();
- virtual Common::Error loadGameState(int slot);
- virtual Common::Error saveGameState(int slot, const Common::String &description);
+ virtual Common::Error loadGameState(int slot) override;
+ virtual Common::Error saveGameState(int slot, const Common::String &description) override;
bool scummVMSaveLoadDialog(bool isSave);
private:
@@ -229,7 +229,7 @@ private:
public:
- virtual GUI::Debugger *getDebugger() { return _debugger; }
+ virtual GUI::Debugger *getDebugger() override { return _debugger; }
private:
Console *_console;
Commit: 58b50be4314207f75b4396526d7ea45276ceeb48
https://github.com/scummvm/scummvm/commit/58b50be4314207f75b4396526d7ea45276ceeb48
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-06T23:46:47+01:00
Commit Message:
WINTERMUTE: Added override keywords
Changed paths:
engines/wintermute/wintermute.h
diff --git a/engines/wintermute/wintermute.h b/engines/wintermute/wintermute.h
index ba7b3a8..0c26c07 100644
--- a/engines/wintermute/wintermute.h
+++ b/engines/wintermute/wintermute.h
@@ -61,13 +61,13 @@ public:
virtual Wintermute::Console *getConsole() { return _debugger; }
void trigDebugger() { _trigDebug = true; }
- virtual Common::Error run();
+ virtual Common::Error run() override;
virtual bool hasFeature(EngineFeature f) const override;
Common::SaveFileManager *getSaveFileMan() { return _saveFileMan; }
- virtual Common::Error loadGameState(int slot);
- virtual bool canLoadGameStateCurrently();
- virtual Common::Error saveGameState(int slot, const Common::String &desc);
- virtual bool canSaveGameStateCurrently();
+ virtual Common::Error loadGameState(int slot) override;
+ virtual bool canLoadGameStateCurrently() override;
+ virtual Common::Error saveGameState(int slot, const Common::String &desc) override;
+ virtual bool canSaveGameStateCurrently() override;
// For detection-purposes:
static bool getGameInfo(const Common::FSList &fslist, Common::String &name, Common::String &caption);
private:
Commit: 78cc55c4b0b11918c6bf5b94d639f2d388d508f6
https://github.com/scummvm/scummvm/commit/78cc55c4b0b11918c6bf5b94d639f2d388d508f6
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-06T23:46:47+01:00
Commit Message:
XEEN: Added override keywords
Changed paths:
engines/xeen/detection.cpp
engines/xeen/xeen.h
diff --git a/engines/xeen/detection.cpp b/engines/xeen/detection.cpp
index 447f0af..fab7243 100644
--- a/engines/xeen/detection.cpp
+++ b/engines/xeen/detection.cpp
@@ -120,24 +120,24 @@ public:
_maxScanDepth = 3;
}
- virtual const char *getEngineId() const {
+ virtual const char *getEngineId() const override {
return "xeen";
}
- virtual const char *getName() const {
+ virtual const char *getName() const override {
return "Xeen";
}
- virtual const char *getOriginalCopyright() const {
+ virtual const char *getOriginalCopyright() const override {
return "Xeen (C) 1992-1993 New World Computing, Inc.";
}
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;
- virtual void removeSaveState(const char *target, int slot) const;
- SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const;
+ virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
+ virtual SaveStateList listSaves(const char *target) const override;
+ virtual int getMaximumSaveSlot() const override;
+ virtual void removeSaveState(const char *target, int slot) const override;
+ SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override;
};
bool XeenMetaEngine::hasFeature(MetaEngineFeature f) const {
diff --git a/engines/xeen/xeen.h b/engines/xeen/xeen.h
index 70b976d..905ade7 100644
--- a/engines/xeen/xeen.h
+++ b/engines/xeen/xeen.h
@@ -131,7 +131,7 @@ private:
void loadSettings();
// Engine APIs
- virtual Common::Error run();
+ virtual Common::Error run() override;
virtual bool hasFeature(EngineFeature f) const override;
/**
@@ -259,27 +259,27 @@ public:
/**
* Load a savegame
*/
- virtual Common::Error loadGameState(int slot);
+ virtual Common::Error loadGameState(int slot) override;
/**
* Save the game
*/
- virtual Common::Error saveGameState(int slot, const Common::String &desc);
+ virtual Common::Error saveGameState(int slot, const Common::String &desc) override;
/**
* Updates sound settings
*/
- virtual void syncSoundSettings();
+ virtual void syncSoundSettings() override;
/**
* Returns true if a savegame can currently be loaded
*/
- virtual bool canLoadGameStateCurrently();
+ virtual bool canLoadGameStateCurrently() override;
/**
* Returns true if the game can currently be saved
*/
- virtual bool canSaveGameStateCurrently();
+ virtual bool canSaveGameStateCurrently() override;
/**
* Show a cutscene
Commit: 445c77007d8b91bf7e7445c3f45ff535df0398e1
https://github.com/scummvm/scummvm/commit/445c77007d8b91bf7e7445c3f45ff535df0398e1
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-06T23:46:47+01:00
Commit Message:
ZVISION: Added override keywords
Changed paths:
engines/zvision/detection.cpp
engines/zvision/zvision.h
diff --git a/engines/zvision/detection.cpp b/engines/zvision/detection.cpp
index d515f8c..08130a2 100644
--- a/engines/zvision/detection.cpp
+++ b/engines/zvision/detection.cpp
@@ -63,24 +63,24 @@ public:
_directoryGlobs = ZVision::directoryGlobs;
}
- const char *getEngineId() const {
+ const char *getEngineId() const override {
return "zvision";
}
- virtual const char *getName() const {
+ virtual const char *getName() const override {
return "Z-Vision";
}
- virtual const char *getOriginalCopyright() const {
+ virtual const char *getOriginalCopyright() const override {
return "Z-Vision (C) 1996 Activision";
}
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;
- void removeSaveState(const char *target, int slot) const;
- SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const;
+ virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
+ SaveStateList listSaves(const char *target) const override;
+ virtual int getMaximumSaveSlot() const override;
+ void removeSaveState(const char *target, int slot) const override;
+ SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override;
};
bool ZVisionMetaEngine::hasFeature(MetaEngineFeature f) const {
diff --git a/engines/zvision/zvision.h b/engines/zvision/zvision.h
index f599eaf..8e9bd95 100644
--- a/engines/zvision/zvision.h
+++ b/engines/zvision/zvision.h
@@ -151,8 +151,8 @@ private:
uint8 _cheatBuffer[KEYBUF_SIZE];
public:
- Common::Error run();
- void pauseEngineIntern(bool pause);
+ Common::Error run() override;
+ void pauseEngineIntern(bool pause) override;
ZVisionGameId getGameId() const;
Common::Language getLanguage() const;
@@ -231,8 +231,8 @@ public:
return _fps;
}
- GUI::Debugger *getDebugger();
- void syncSoundSettings();
+ GUI::Debugger *getDebugger() override;
+ void syncSoundSettings() override;
void loadSettings();
void saveSettings();
@@ -241,10 +241,10 @@ public:
// Engine features
bool hasFeature(EngineFeature f) const override;
- bool canLoadGameStateCurrently();
- bool canSaveGameStateCurrently();
- Common::Error loadGameState(int slot);
- Common::Error saveGameState(int slot, const Common::String &desc);
+ bool canLoadGameStateCurrently() override;
+ bool canSaveGameStateCurrently() override;
+ Common::Error loadGameState(int slot) override;
+ Common::Error saveGameState(int slot, const Common::String &desc) override;
private:
void initialize();
More information about the Scummvm-git-logs
mailing list