[Scummvm-git-logs] scummvm master -> 5fde10383dc8b765382d1751877250253005173e
sev-
sev at scummvm.org
Wed Feb 5 15:18:59 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:
3265068c67 MOHAWK: Added override keywords
9be24ff214 MORTEVIELLE: Added override keywords
0f1bf292d0 NEVERHOOD: Added override keywords
9b6a4c8ba7 PARALLACTION: Added override keywords
0a852831ac PEGASUS: Added override keywords
f0a3ed06d8 PINK: Added override keywords
4731d35872 PLUMBERS: Added override keywords
003d389076 PRINCE: Added override keywords
ee06c9d910 QUEEN: Added override keywords
d145eccdb4 SAGA: Added override keywords
62f67f4bfa SCI: Added override keywords
d5d72a13e4 SHERLOCK: Added override keywords
cbafa4cc2c SKY: Added override keywords
b2d0b8963d STARTREK: Added override keywords
cb9bd4dd70 SUPERNOVA: Added override keywords
5fde10383d SWORD1: Added override keywords
Commit: 3265068c672d547e07a8ab578d370bd3738615cc
https://github.com/scummvm/scummvm/commit/3265068c672d547e07a8ab578d370bd3738615cc
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-05T15:56:33+01:00
Commit Message:
MOHAWK: Added override keywords
Changed paths:
engines/mohawk/riven.h
diff --git a/engines/mohawk/riven.h b/engines/mohawk/riven.h
index ab55dd2..69c4c2d 100644
--- a/engines/mohawk/riven.h
+++ b/engines/mohawk/riven.h
@@ -171,7 +171,7 @@ public:
void runSaveDialog();
void tryAutoSaving();
void loadGameStateAndDisplayError(int slot);
- Common::Error saveGameState(int slot, const Common::String &desc, bool autosave);
+ Common::Error saveGameState(int slot, const Common::String &desc, bool autosave) override;
void saveGameStateAndDisplayError(int slot, const Common::String &desc);
/**
Commit: 9be24ff214328382c995a03c7304656867244270
https://github.com/scummvm/scummvm/commit/9be24ff214328382c995a03c7304656867244270
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-05T15:58:16+01:00
Commit Message:
MORTEVIELLE: Added override keywords
Changed paths:
engines/mortevielle/detection.cpp
engines/mortevielle/mortevielle.h
diff --git a/engines/mortevielle/detection.cpp b/engines/mortevielle/detection.cpp
index bcf64bb..e9fa689 100644
--- a/engines/mortevielle/detection.cpp
+++ b/engines/mortevielle/detection.cpp
@@ -60,23 +60,23 @@ public:
_flags = kADFlagUseExtraAsHint;
}
- const char *getEngineId() const {
+ const char *getEngineId() const override {
return "mortevielle";
}
- virtual const char *getName() const {
+ virtual const char *getName() const override {
return "Mortville Manor";
}
- virtual const char *getOriginalCopyright() const {
+ virtual const char *getOriginalCopyright() const override {
return "Mortville Manor (C) 1987-89 Lankhor";
}
- 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 int getMaximumSaveSlot() const;
- virtual SaveStateList listSaves(const char *target) const;
- virtual SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const;
+ virtual int getMaximumSaveSlot() const override;
+ virtual SaveStateList listSaves(const char *target) const override;
+ virtual SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override;
};
bool MortevielleMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
diff --git a/engines/mortevielle/mortevielle.h b/engines/mortevielle/mortevielle.h
index 4cc681f..beb37a7 100644
--- a/engines/mortevielle/mortevielle.h
+++ b/engines/mortevielle/mortevielle.h
@@ -440,13 +440,13 @@ public:
MortevielleEngine(OSystem *system, const MortevielleGameDescription *gameDesc);
~MortevielleEngine();
virtual bool hasFeature(EngineFeature f) const override;
- virtual bool canLoadGameStateCurrently();
- virtual bool canSaveGameStateCurrently();
- virtual Common::Error loadGameState(int slot);
- virtual Common::Error saveGameState(int slot, const Common::String &desc);
- virtual Common::Error run();
- virtual void pauseEngineIntern(bool pause);
- virtual GUI::Debugger *getDebugger() {return _debugger;}
+ 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 Common::Error run() override;
+ virtual void pauseEngineIntern(bool pause) override;
+ virtual GUI::Debugger *getDebugger() override { return _debugger; }
uint32 getGameFlags() const;
Common::Language getLanguage() const;
Common::Language getOriginalLanguage() const;
Commit: 0f1bf292d0f76192d8d0e43f708215b8c0013e2a
https://github.com/scummvm/scummvm/commit/0f1bf292d0f76192d8d0e43f708215b8c0013e2a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-05T16:00:05+01:00
Commit Message:
NEVERHOOD: Added override keywords
Changed paths:
engines/neverhood/detection.cpp
engines/neverhood/neverhood.h
diff --git a/engines/neverhood/detection.cpp b/engines/neverhood/detection.cpp
index dff01e1..ddd9469 100644
--- a/engines/neverhood/detection.cpp
+++ b/engines/neverhood/detection.cpp
@@ -201,25 +201,25 @@ public:
_guiOptions = GUIO2(GUIO_NOSUBTITLES, GUIO_NOMIDI);
}
- const char *getEngineId() const {
+ const char *getEngineId() const override {
return "neverhood";
}
- virtual const char *getName() const {
+ virtual const char *getName() const override {
return "The Neverhood Chronicles";
}
- virtual const char *getOriginalCopyright() const {
+ virtual const char *getOriginalCopyright() const override {
return "The Neverhood Chronicles (C) The Neverhood, Inc.";
}
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;
};
diff --git a/engines/neverhood/neverhood.h b/engines/neverhood/neverhood.h
index cb50e25..b6ed929 100644
--- a/engines/neverhood/neverhood.h
+++ b/engines/neverhood/neverhood.h
@@ -59,7 +59,7 @@ struct GameState {
class NeverhoodEngine : public ::Engine {
protected:
- Common::Error run();
+ Common::Error run() override;
void mainLoop();
public:
@@ -90,7 +90,7 @@ public:
GameModule *_gameModule;
StaticData *_staticData;
Console *_console;
- GUI::Debugger *getDebugger() { return _console; }
+ GUI::Debugger *getDebugger() override { return _console; }
SoundMan *_soundMan;
AudioResourceMan *_audioResourceMan;
@@ -119,11 +119,11 @@ public:
bool _isSaveAllowed;
- bool canLoadGameStateCurrently() { return _isSaveAllowed; }
- bool canSaveGameStateCurrently() { return _isSaveAllowed; }
+ bool canLoadGameStateCurrently() override { return _isSaveAllowed; }
+ bool canSaveGameStateCurrently() override { return _isSaveAllowed; }
- Common::Error loadGameState(int slot);
- Common::Error saveGameState(int slot, const Common::String &description);
+ Common::Error loadGameState(int slot) override;
+ Common::Error saveGameState(int slot, const Common::String &description) override;
Common::Error removeGameState(int slot);
bool savegame(const char *filename, const char *description);
bool loadgame(const char *filename);
Commit: 9b6a4c8ba718c707a9d6f5edfc26239484cb91db
https://github.com/scummvm/scummvm/commit/9b6a4c8ba718c707a9d6f5edfc26239484cb91db
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-05T16:01:52+01:00
Commit Message:
PARALLACTION: Added override keywords
Changed paths:
engines/parallaction/detection.cpp
engines/parallaction/parallaction.h
diff --git a/engines/parallaction/detection.cpp b/engines/parallaction/detection.cpp
index 6210352..87c92fe 100644
--- a/engines/parallaction/detection.cpp
+++ b/engines/parallaction/detection.cpp
@@ -222,23 +222,23 @@ public:
_guiOptions = GUIO1(GUIO_NOLAUNCHLOAD);
}
- virtual const char *getEngineId() const {
+ virtual const char *getEngineId() const override {
return "parallaction";
}
- virtual const char *getName() const {
+ virtual const char *getName() const override {
return "Parallaction";
}
- virtual const char *getOriginalCopyright() const {
+ virtual const char *getOriginalCopyright() const override {
return "Nippon Safes Inc. (C) Dynabyte";
}
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;
+ 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;
};
bool ParallactionMetaEngine::hasFeature(MetaEngineFeature f) const {
diff --git a/engines/parallaction/parallaction.h b/engines/parallaction/parallaction.h
index e9026d6..881564f 100644
--- a/engines/parallaction/parallaction.h
+++ b/engines/parallaction/parallaction.h
@@ -263,7 +263,7 @@ public:
// Engine APIs
virtual Common::Error init();
virtual Common::Error go() = 0;
- virtual Common::Error run() {
+ virtual Common::Error run() override {
Common::Error err;
err = init();
if (err.getCode() != Common::kNoError)
@@ -272,8 +272,8 @@ public:
}
virtual bool hasFeature(EngineFeature f) const override;
- virtual void pauseEngineIntern(bool pause);
- virtual GUI::Debugger *getDebugger();
+ virtual void pauseEngineIntern(bool pause) override;
+ virtual GUI::Debugger *getDebugger() override;
// info
int32 _screenWidth;
Commit: 0a852831ac9e3acb10c5d8ca2a7bddf4a721e2d5
https://github.com/scummvm/scummvm/commit/0a852831ac9e3acb10c5d8ca2a7bddf4a721e2d5
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-05T16:03:44+01:00
Commit Message:
PEGASUS: Added override keywords
Changed paths:
engines/pegasus/pegasus.h
diff --git a/engines/pegasus/pegasus.h b/engines/pegasus/pegasus.h
index 09c9a7f..dd0f112 100644
--- a/engines/pegasus/pegasus.h
+++ b/engines/pegasus/pegasus.h
@@ -78,11 +78,11 @@ public:
// Engine stuff
const PegasusGameDescription *_gameDescription;
bool hasFeature(EngineFeature f) const override;
- GUI::Debugger *getDebugger();
- bool canLoadGameStateCurrently();
- bool canSaveGameStateCurrently();
- Common::Error loadGameState(int slot);
- Common::Error saveGameState(int slot, const Common::String &desc);
+ GUI::Debugger *getDebugger() override;
+ bool canLoadGameStateCurrently() override;
+ bool canSaveGameStateCurrently() override;
+ Common::Error loadGameState(int slot) override;
+ Common::Error saveGameState(int slot, const Common::String &desc) override;
static Common::Array<Common::Keymap *> initKeymaps();
// Base classes
@@ -204,21 +204,21 @@ public:
static Common::StringArray listSaveFiles();
protected:
- Common::Error run();
- void pauseEngineIntern(bool pause);
+ Common::Error run() override;
+ void pauseEngineIntern(bool pause) override;
Notification _shellNotification;
- virtual void receiveNotification(Notification *notification, const NotificationFlags flags);
+ virtual void receiveNotification(Notification *notification, const NotificationFlags flags) override;
- void handleInput(const Input &input, const Hotspot *cursorSpot);
- virtual bool isClickInput(const Input &, const Hotspot *);
- virtual InputBits getClickFilter();
+ void handleInput(const Input &input, const Hotspot *cursorSpot) override;
+ virtual bool isClickInput(const Input &, const Hotspot *) override;
+ virtual InputBits getClickFilter() override;
- void clickInHotspot(const Input &, const Hotspot *);
- void activateHotspots(void);
+ void clickInHotspot(const Input &, const Hotspot *) override;
+ void activateHotspots(void) override;
- void updateCursor(const Common::Point, const Hotspot *);
- bool wantsCursor();
+ void updateCursor(const Common::Point, const Hotspot *) override;
+ bool wantsCursor() override;
private:
// Console
@@ -273,7 +273,7 @@ private:
void doSubChase();
uint getNeighborhoodCD(const NeighborhoodID neighborhood) const;
uint _currentCD;
- InputBits getInputFilter();
+ InputBits getInputFilter() override;
// Menu
GameMenu *_gameMenu;
Commit: f0a3ed06d89b5a7a3f9d3e34d9dc2f9c8c355434
https://github.com/scummvm/scummvm/commit/f0a3ed06d89b5a7a3f9d3e34d9dc2f9c8c355434
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-05T16:04:50+01:00
Commit Message:
PINK: Added override keywords
Changed paths:
engines/pink/detection.cpp
diff --git a/engines/pink/detection.cpp b/engines/pink/detection.cpp
index b9243c7..08a78d8 100644
--- a/engines/pink/detection.cpp
+++ b/engines/pink/detection.cpp
@@ -40,7 +40,7 @@ static const PlainGameDescriptor pinkGames[] = {
{0, 0}
};
-#include "detection_tables.h"
+#include "pink/detection_tables.h"
static const char *directoryGlobs[] = {
"install",
@@ -56,24 +56,24 @@ public:
_directoryGlobs = directoryGlobs;
}
- virtual const char *getEngineId() const {
+ virtual const char *getEngineId() const override {
return "pink";
}
- virtual const char *getName() const {
+ virtual const char *getName() const override {
return "Pink Panther";
}
- virtual const char *getOriginalCopyright() const {
+ virtual const char *getOriginalCopyright() const override {
return "Pink Panther (C) Wanderlust Interactive";
}
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;
- virtual SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const;
- virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
+ virtual int getMaximumSaveSlot() const override { return 99; }
+ virtual SaveStateList listSaves(const char *target) const override;
+ virtual void removeSaveState(const char *target, int slot) const override;
+ virtual SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override;
+ virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
};
bool PinkMetaEngine::hasFeature(MetaEngineFeature f) const {
Commit: 4731d35872e97ba03a6e640f16655c828c11e70e
https://github.com/scummvm/scummvm/commit/4731d35872e97ba03a6e640f16655c828c11e70e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-05T16:05:38+01:00
Commit Message:
PLUMBERS: Added override keywords
Changed paths:
engines/plumbers/detection.cpp
diff --git a/engines/plumbers/detection.cpp b/engines/plumbers/detection.cpp
index 30d28d9..893eeba 100644
--- a/engines/plumbers/detection.cpp
+++ b/engines/plumbers/detection.cpp
@@ -73,20 +73,20 @@ public:
PlumbersMetaEngine() : AdvancedMetaEngine(Plumbers::gameDescriptions, sizeof(ADGameDescription), plumbersGames) {
}
- const char *getEngineId() const {
+ const char *getEngineId() const override {
return "plumbers";
}
- virtual const char *getName() const {
+ virtual const char *getName() const override {
return "Plumbers Don't Wear Ties";
}
- virtual const char *getOriginalCopyright() const {
+ virtual const char *getOriginalCopyright() const override {
return "Plumbers Don't Wear Ties (C) 1993-94 Kirin Entertainment";
}
virtual bool hasFeature(MetaEngineFeature f) const override;
- virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
+ virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
};
bool PlumbersMetaEngine::hasFeature(MetaEngineFeature f) const {
Commit: 003d3890766e8584fbeaeae691b5ef2ddfbca950
https://github.com/scummvm/scummvm/commit/003d3890766e8584fbeaeae691b5ef2ddfbca950
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-05T16:07:12+01:00
Commit Message:
PRINCE: Added override keywords
Changed paths:
engines/prince/detection.cpp
engines/prince/prince.h
diff --git a/engines/prince/detection.cpp b/engines/prince/detection.cpp
index 47e15ea..e4220f0 100644
--- a/engines/prince/detection.cpp
+++ b/engines/prince/detection.cpp
@@ -152,24 +152,24 @@ public:
_directoryGlobs = directoryGlobs;
}
- const char *getEngineId() const {
- return "prince";
- }
+ const char *getEngineId() const override {
+ return "prince";
+ }
- virtual const char *getName() const {
- return "The Prince and the Coward";
+ virtual const char *getName() const override {
+ return "The Prince and the Coward";
}
- virtual const char *getOriginalCopyright() const {
+ virtual const char *getOriginalCopyright() const override {
return "The Prince and the Coward (C) 1996-97 Metropolis";
}
- 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 int getMaximumSaveSlot() const { return 99; }
- virtual SaveStateList listSaves(const char *target) const;
- SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const;
- virtual void removeSaveState(const char *target, int slot) const;
+ virtual int getMaximumSaveSlot() const override { return 99; }
+ virtual SaveStateList listSaves(const char *target) const override;
+ SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override;
+ virtual void removeSaveState(const char *target, int slot) const override;
};
bool PrinceMetaEngine::hasFeature(MetaEngineFeature f) const {
diff --git a/engines/prince/prince.h b/engines/prince/prince.h
index a6c5a12..c313e42 100644
--- a/engines/prince/prince.h
+++ b/engines/prince/prince.h
@@ -273,7 +273,7 @@ enum Type {
class PrinceEngine : public Engine {
protected:
- Common::Error run();
+ Common::Error run() override;
public:
PrinceEngine(OSystem *syst, const PrinceGameDescription *gameDesc);
@@ -282,11 +282,11 @@ public:
bool scummVMSaveLoadDialog(bool isSave);
virtual bool hasFeature(EngineFeature f) const override;
- virtual void pauseEngineIntern(bool pause);
- virtual bool canSaveGameStateCurrently();
- virtual bool canLoadGameStateCurrently();
- virtual Common::Error saveGameState(int slot, const Common::String &desc);
- virtual Common::Error loadGameState(int slot);
+ virtual void pauseEngineIntern(bool pause) override;
+ virtual bool canSaveGameStateCurrently() override;
+ virtual bool canLoadGameStateCurrently() override;
+ virtual Common::Error saveGameState(int slot, const Common::String &desc) override;
+ virtual Common::Error loadGameState(int slot) override;
void playVideo(Common::String videoFilename);
@@ -340,7 +340,7 @@ public:
void setVoice(uint16 slot, uint32 sampleSlot, uint16 flag);
- virtual GUI::Debugger *getDebugger();
+ virtual GUI::Debugger *getDebugger() override;
void changeCursor(uint16 curId);
void printAt(uint32 slot, uint8 color, char *s, uint16 x, uint16 y);
Commit: ee06c9d91055af80cdbcf3a20c3f7cc52ed61c34
https://github.com/scummvm/scummvm/commit/ee06c9d91055af80cdbcf3a20c3f7cc52ed61c34
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-05T16:08:10+01:00
Commit Message:
QUEEN: Added override keywords
Changed paths:
engines/queen/queen.h
diff --git a/engines/queen/queen.h b/engines/queen/queen.h
index 5f2b8cf..f000d79 100644
--- a/engines/queen/queen.h
+++ b/engines/queen/queen.h
@@ -94,10 +94,10 @@ public:
void update(bool checkPlayerInput = false);
bool canLoadOrSave() const;
- bool canLoadGameStateCurrently();
- bool canSaveGameStateCurrently();
- Common::Error saveGameState(int slot, const Common::String &desc);
- Common::Error loadGameState(int slot);
+ bool canLoadGameStateCurrently() override;
+ bool canSaveGameStateCurrently() override;
+ Common::Error saveGameState(int slot, const Common::String &desc) override;
+ Common::Error loadGameState(int slot) override;
void makeGameStateName(int slot, char *buf) const;
int getGameStateSlot(const char *filename) const;
void findGameStateDescriptions(char descriptions[100][32]);
@@ -119,10 +119,10 @@ public:
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 syncSoundSettings() override;
int _talkSpeed;
Commit: d145eccdb419f22f156cc9fb4af017c80e7b1b38
https://github.com/scummvm/scummvm/commit/d145eccdb419f22f156cc9fb4af017c80e7b1b38
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-05T16:10:07+01:00
Commit Message:
SAGA: Added override keywords
Changed paths:
engines/saga/detection.cpp
engines/saga/saga.h
diff --git a/engines/saga/detection.cpp b/engines/saga/detection.cpp
index ea3bb33..899b13d 100644
--- a/engines/saga/detection.cpp
+++ b/engines/saga/detection.cpp
@@ -94,11 +94,11 @@ public:
SagaMetaEngine() : AdvancedMetaEngine(Saga::gameDescriptions, sizeof(Saga::SAGAGameDescription), sagaGames) {
}
- const char *getEngineId() const {
+ const char *getEngineId() const override {
return "saga";
}
- virtual const char *getName() const {
+ virtual const char *getName() const override {
return "SAGA ["
#if defined(ENABLE_IHNM) && defined(ENABLE_SAGA2)
@@ -120,21 +120,21 @@ public:
;
}
- virtual const char *getOriginalCopyright() const {
+ virtual const char *getOriginalCopyright() const override {
return "Inherit the Earth (C) Wyrmkeep Entertainment";
}
virtual bool hasFeature(MetaEngineFeature f) const override;
- virtual Common::Error createInstance(OSystem *syst, Engine **engine) const {
+ virtual Common::Error createInstance(OSystem *syst, Engine **engine) const override {
return AdvancedMetaEngine::createInstance(syst, engine);
}
- virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
+ virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
- 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 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 SagaMetaEngine::hasFeature(MetaEngineFeature f) const {
diff --git a/engines/saga/saga.h b/engines/saga/saga.h
index 2923408..ebc5ac7 100644
--- a/engines/saga/saga.h
+++ b/engines/saga/saga.h
@@ -466,12 +466,12 @@ class SagaEngine : public Engine {
public:
// Engine APIs
- virtual Common::Error run();
+ virtual Common::Error run() override;
bool hasFeature(EngineFeature f) const override;
- void syncSoundSettings();
- void pauseEngineIntern(bool pause);
+ void syncSoundSettings() override;
+ void pauseEngineIntern(bool pause) override;
- GUI::Debugger *getDebugger();
+ GUI::Debugger *getDebugger() override;
SagaEngine(OSystem *syst, const SAGAGameDescription *gameDesc);
~SagaEngine();
@@ -629,10 +629,10 @@ public:
const ADGameFileDescription *getFilesDescriptions() const;
const Common::Rect &getDisplayClip() const { return _displayClip;}
- Common::Error loadGameState(int slot);
- Common::Error saveGameState(int slot, const Common::String &desc);
- bool canLoadGameStateCurrently();
- bool canSaveGameStateCurrently();
+ Common::Error loadGameState(int slot) override;
+ Common::Error saveGameState(int slot, const Common::String &desc) override;
+ bool canLoadGameStateCurrently() override;
+ bool canSaveGameStateCurrently() override;
const GameDisplayInfo &getDisplayInfo();
const char *getTextString(int textStringId);
Commit: 62f67f4bfa3a522a495a964d74afa9dc3725cc69
https://github.com/scummvm/scummvm/commit/62f67f4bfa3a522a495a964d74afa9dc3725cc69
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-05T16:11:11+01:00
Commit Message:
SCI: Added override keywords
Changed paths:
engines/sci/sci.h
diff --git a/engines/sci/sci.h b/engines/sci/sci.h
index 087aab5..045c95a 100644
--- a/engines/sci/sci.h
+++ b/engines/sci/sci.h
@@ -254,16 +254,16 @@ public:
~SciEngine();
// Engine APIs
- virtual Common::Error run();
+ virtual Common::Error run() override;
bool hasFeature(EngineFeature f) const override;
- void pauseEngineIntern(bool pause);
- virtual GUI::Debugger *getDebugger();
+ void pauseEngineIntern(bool pause) override;
+ virtual GUI::Debugger *getDebugger() override;
Console *getSciDebugger();
- Common::Error loadGameState(int slot);
- Common::Error saveGameState(int slot, const Common::String &desc);
- bool canLoadGameStateCurrently();
- bool canSaveGameStateCurrently();
- void syncSoundSettings(); ///< from ScummVM to the game
+ Common::Error loadGameState(int slot) override;
+ Common::Error saveGameState(int slot, const Common::String &desc) override;
+ bool canLoadGameStateCurrently() override;
+ bool canSaveGameStateCurrently() override;
+ void syncSoundSettings() override; ///< from ScummVM to the game
void updateSoundMixerVolumes();
uint32 getTickCount();
void setTickCount(const uint32 ticks);
Commit: d5d72a13e4f60ac44c20798294179ca009bb1195
https://github.com/scummvm/scummvm/commit/d5d72a13e4f60ac44c20798294179ca009bb1195
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-05T16:13:39+01:00
Commit Message:
SHERLOCK: Added override keywords
Changed paths:
engines/sherlock/detection.cpp
engines/sherlock/sherlock.h
diff --git a/engines/sherlock/detection.cpp b/engines/sherlock/detection.cpp
index 847681c..2f03aad 100644
--- a/engines/sherlock/detection.cpp
+++ b/engines/sherlock/detection.cpp
@@ -151,22 +151,22 @@ public:
SherlockMetaEngine() : AdvancedMetaEngine(Sherlock::gameDescriptions, sizeof(Sherlock::SherlockGameDescription),
sherlockGames, optionsList) {}
- virtual const char *getEngineId() const {
+ virtual const char *getEngineId() const override {
return "sherlock";
}
- virtual const char *getName() const {
+ virtual const char *getName() const override {
return "Sherlock";
}
- virtual const char *getOriginalCopyright() const {
+ virtual const char *getOriginalCopyright() const override {
return "Sherlock (C) 1992-1996 Mythos Software, (C) 1992-1996 Electronic Arts";
}
/**
* Creates an instance of the game engine
*/
- virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
+ virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
/**
* Returns a list of features the game's MetaEngine support
@@ -176,22 +176,22 @@ public:
/**
* Return a list of savegames
*/
- virtual SaveStateList listSaves(const char *target) const;
+ virtual SaveStateList listSaves(const char *target) const override;
/**
* Returns the maximum number of allowed save slots
*/
- virtual int getMaximumSaveSlot() const;
+ virtual int getMaximumSaveSlot() const override;
/**
* Deletes a savegame in the specified slot
*/
- virtual void removeSaveState(const char *target, int slot) const;
+ virtual void removeSaveState(const char *target, int slot) const override;
/**
* Given a specified savegame slot, returns extended information for the save
*/
- SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const;
+ SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override;
};
bool SherlockMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
diff --git a/engines/sherlock/sherlock.h b/engines/sherlock/sherlock.h
index d729bb4..6486083 100644
--- a/engines/sherlock/sherlock.h
+++ b/engines/sherlock/sherlock.h
@@ -142,32 +142,32 @@ public:
/**
* Main method for running the game
*/
- virtual Common::Error run();
+ virtual Common::Error run() override;
/**
* 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;
/**
* Called by the engine when sound settings are updated
*/
- virtual void syncSoundSettings();
+ virtual void syncSoundSettings() override;
/**
* Saves game configuration information
Commit: cbafa4cc2ce2fca1a6d4a52853a3e2ea21548bbb
https://github.com/scummvm/scummvm/commit/cbafa4cc2ce2fca1a6d4a52853a3e2ea21548bbb
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-05T16:14:36+01:00
Commit Message:
SKY: Added override keywords
Changed paths:
engines/sky/sky.h
diff --git a/engines/sky/sky.h b/engines/sky/sky.h
index 36bcc7c..c157387 100644
--- a/engines/sky/sky.h
+++ b/engines/sky/sky.h
@@ -81,15 +81,15 @@ public:
SkyEngine(OSystem *syst);
virtual ~SkyEngine();
- virtual void syncSoundSettings();
+ virtual void syncSoundSettings() override;
static bool isDemo();
static bool isCDVersion();
- Common::Error loadGameState(int slot);
- Common::Error saveGameState(int slot, const Common::String &desc);
- bool canLoadGameStateCurrently();
- bool canSaveGameStateCurrently();
+ Common::Error loadGameState(int slot) override;
+ Common::Error saveGameState(int slot, const Common::String &desc) override;
+ bool canLoadGameStateCurrently() override;
+ bool canSaveGameStateCurrently() override;
static void *fetchItem(uint32 num);
static void *_itemList[300];
@@ -100,14 +100,14 @@ protected:
// Engine APIs
Common::Error init();
Common::Error go();
- virtual Common::Error run() {
+ virtual Common::Error run() override {
Common::Error err;
err = init();
if (err.getCode() != Common::kNoError)
return err;
return go();
}
- virtual GUI::Debugger *getDebugger();
+ virtual GUI::Debugger *getDebugger() override;
virtual bool hasFeature(EngineFeature f) const override;
byte _fastMode;
Commit: b2d0b8963d6c6d45f05510e3bd2d4e200ea95f1e
https://github.com/scummvm/scummvm/commit/b2d0b8963d6c6d45f05510e3bd2d4e200ea95f1e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-05T16:15:34+01:00
Commit Message:
STARTREK: Added override keywords
Changed paths:
engines/startrek/detection.cpp
diff --git a/engines/startrek/detection.cpp b/engines/startrek/detection.cpp
index c1fcb60..a9534d3 100644
--- a/engines/startrek/detection.cpp
+++ b/engines/startrek/detection.cpp
@@ -95,7 +95,7 @@ static const StarTrekGameDescription gameDescriptions[] = {
},
GType_ST25,
GF_CDROM,
- },
+ },
{ // ST25 DOS CD-ROM edition (FR)
{
@@ -322,25 +322,25 @@ public:
StarTrekMetaEngine() : AdvancedMetaEngine(StarTrek::gameDescriptions, sizeof(StarTrek::StarTrekGameDescription), starTrekGames) {
}
- const char *getEngineId() const {
+ const char *getEngineId() const override {
return "startrek";
}
- virtual const char *getName() const {
+ virtual const char *getName() const override {
return "Star Trek";
}
- virtual const char *getOriginalCopyright() const {
+ virtual const char *getOriginalCopyright() const override {
return "Star Trek: 25th Anniversary, Star Trek: Judgment Rites (C) Interplay";
}
virtual bool hasFeature(MetaEngineFeature f) const override;
- virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const;
+ virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
- 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 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 StarTrekMetaEngine::hasFeature(MetaEngineFeature f) const {
@@ -480,4 +480,3 @@ REGISTER_PLUGIN_DYNAMIC(STARTREK, PLUGIN_TYPE_ENGINE, StarTrekMetaEngine);
#else
REGISTER_PLUGIN_STATIC(STARTREK, PLUGIN_TYPE_ENGINE, StarTrekMetaEngine);
#endif
-
Commit: cb9bd4dd70069aa65a49a39e4cf8ac677313da33
https://github.com/scummvm/scummvm/commit/cb9bd4dd70069aa65a49a39e4cf8ac677313da33
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-05T16:17:22+01:00
Commit Message:
SUPERNOVA: Added override keywords
Changed paths:
engines/supernova/detection.cpp
engines/supernova/supernova.h
diff --git a/engines/supernova/detection.cpp b/engines/supernova/detection.cpp
index add4c67..23fe1f6 100644
--- a/engines/supernova/detection.cpp
+++ b/engines/supernova/detection.cpp
@@ -102,26 +102,26 @@ public:
SupernovaMetaEngine() : AdvancedMetaEngine(Supernova::gameDescriptions, sizeof(ADGameDescription), supernovaGames, optionsList) {
}
- const char *getEngineId() const {
+ const char *getEngineId() const override {
return "supernova";
}
- virtual const char *getName() const {
+ virtual const char *getName() const override {
return "Mission Supernova";
}
- virtual const char *getOriginalCopyright() const {
+ virtual const char *getOriginalCopyright() const override {
return "Mission Supernova (C) 1994 Thomas and Steffen Dingel";
}
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;
- virtual int getMaximumSaveSlot() const {
+ virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
+ virtual SaveStateList listSaves(const char *target) const override;
+ virtual void removeSaveState(const char *target, int slot) const override;
+ virtual int getMaximumSaveSlot() const override {
return 99;
}
- virtual SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const;
+ virtual SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override;
};
bool SupernovaMetaEngine::hasFeature(MetaEngineFeature f) const {
@@ -210,7 +210,7 @@ SaveStateDescriptor SupernovaMetaEngine::querySaveMetaInfos(const char *target,
if (savefile) {
uint saveHeader = savefile->readUint32LE();
- if ((!strncmp(target, "msn1", 4) && saveHeader != SAVEGAME_HEADER) ||
+ if ((!strncmp(target, "msn1", 4) && saveHeader != SAVEGAME_HEADER) ||
(!strncmp(target, "msn2", 4) && saveHeader != SAVEGAME_HEADER2)) {
delete savefile;
return SaveStateDescriptor();
diff --git a/engines/supernova/supernova.h b/engines/supernova/supernova.h
index 8e51a35..a4dd15a 100644
--- a/engines/supernova/supernova.h
+++ b/engines/supernova/supernova.h
@@ -64,13 +64,13 @@ public:
explicit SupernovaEngine(OSystem *syst);
~SupernovaEngine();
- virtual Common::Error run();
- 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 run() override;
+ 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;
virtual bool hasFeature(EngineFeature f) const override;
- virtual void pauseEngineIntern(bool pause);
+ virtual void pauseEngineIntern(bool pause) override;
GameManager *_gm;
Console *_console;
Commit: 5fde10383dc8b765382d1751877250253005173e
https://github.com/scummvm/scummvm/commit/5fde10383dc8b765382d1751877250253005173e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-05T16:18:32+01:00
Commit Message:
SWORD1: Added override keywords
Changed paths:
engines/sword1/sword1.h
diff --git a/engines/sword1/sword1.h b/engines/sword1/sword1.h
index ae22bff..a72442d 100644
--- a/engines/sword1/sword1.h
+++ b/engines/sword1/sword1.h
@@ -98,7 +98,7 @@ protected:
// Engine APIs
Common::Error init();
Common::Error go();
- virtual Common::Error run() {
+ virtual Common::Error run() override {
Common::Error err;
err = init();
if (err.getCode() != Common::kNoError)
@@ -106,14 +106,14 @@ protected:
return go();
}
virtual bool hasFeature(EngineFeature f) const override;
- virtual void syncSoundSettings();
+ virtual void syncSoundSettings() override;
- GUI::Debugger *getDebugger() { return _console; }
+ GUI::Debugger *getDebugger() override { return _console; }
- Common::Error loadGameState(int slot);
- bool canLoadGameStateCurrently();
- Common::Error saveGameState(int slot, const Common::String &desc);
- bool canSaveGameStateCurrently();
+ Common::Error loadGameState(int slot) override;
+ bool canLoadGameStateCurrently() override;
+ Common::Error saveGameState(int slot, const Common::String &desc) override;
+ bool canSaveGameStateCurrently() override;
private:
void delay(int32 amount);
More information about the Scummvm-git-logs
mailing list