[Scummvm-git-logs] scummvm master -> 21b34f8861d0c7754e914e59534bbb7f9948011d
sev-
sev at scummvm.org
Wed Feb 5 14:00:03 UTC 2020
This automated email contains information about 14 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
bfcbdc85ff DIRECTOR: Fixed score header reading
ae2ddbeac6 SCUMM: Added override keywords
2b90d1acba ACCESS: Added override keywords
4fd97dffe0 ADL: Added override keywords
cf755dc921 AGI: Added override keywords
14d7e5ac4d AGOS: Added override keywords
3f8280ce11 AVALANCHE: Added override keywords
79e13ed85f BBVS: Added override keywords
fbaaba8960 CGE: Added override keywords
ba708682b2 CGE2: Added override keywords
716fca8894 CHEWY: Added override keywords
1203705666 CINE: Added override kyewords
da04521480 CRUISE: Added override keywords
21b34f8861 COMPOSER: Added override keywords
Commit: bfcbdc85ff7e6b2815c9e05c6ab587cd88a451bb
https://github.com/scummvm/scummvm/commit/bfcbdc85ff7e6b2815c9e05c6ab587cd88a451bb
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-05T14:26:26+01:00
Commit Message:
DIRECTOR: Fixed score header reading
Changed paths:
engines/director/score.cpp
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index 5051f9d..59f704a 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -420,11 +420,24 @@ void Score::loadFrames(Common::SeekableSubReadStreamEndian &stream) {
uint16 version = stream.readUint16();
uint16 spriteRecordSize = stream.readUint16();
uint16 numChannels = stream.readUint16();
- uint16 unk1 = stream.readUint16();
- size -= 16;
+ uint16 numChannelsDisplayed;
+ size -= 14;
- warning("STUB: Score::loadFrames. frame1Offset: %x numFrames: %x version: %x spriteRecordSize: %x numChannels: %x unk1: %x",
- frame1Offset, numFrames, version, spriteRecordSize, numChannels, unk1);
+ if (version > 13) {
+ numChannelsDisplayed = stream.readUint16();
+ } else {
+ if (version <= 7) // Director5
+ numChannelsDisplayed = 28;
+ else
+ numChannelsDisplayed = 120; // D6
+
+ stream.readUint16(); // Skip
+ }
+
+ size -= 2;
+
+ warning("STUB: Score::loadFrames. frame1Offset: %x numFrames: %x version: %x spriteRecordSize: %x numChannels: %x numChannelsDisplayed: %x",
+ frame1Offset, numFrames, version, spriteRecordSize, numChannels, numChannelsDisplayed);
// Unknown, some bytes - constant (refer to contuinity).
} else if (_vm->getVersion() > 4) {
//what data is up the top of D5 VWSC?
Commit: ae2ddbeac6a7b3c5ae8d09e7d29a17c89f101a48
https://github.com/scummvm/scummvm/commit/ae2ddbeac6a7b3c5ae8d09e7d29a17c89f101a48
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-05T14:31:09+01:00
Commit Message:
SCUMM: Added override keywords
Changed paths:
engines/scumm/scumm.h
diff --git a/engines/scumm/scumm.h b/engines/scumm/scumm.h
index 019ff1e..eeceb13 100644
--- a/engines/scumm/scumm.h
+++ b/engines/scumm/scumm.h
@@ -421,24 +421,24 @@ public:
// 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 void errorString(const char *buf_input, char *buf_output, int buf_output_size);
- virtual GUI::Debugger *getDebugger();
+ virtual void errorString(const char *buf_input, char *buf_output, int buf_output_size) override;
+ virtual GUI::Debugger *getDebugger() override;
virtual bool hasFeature(EngineFeature f) const override;
- virtual void syncSoundSettings();
+ virtual void syncSoundSettings() override;
- 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;
- virtual void pauseEngineIntern(bool pause);
+ virtual void pauseEngineIntern(bool pause) override;
protected:
virtual void setupScumm();
@@ -494,7 +494,7 @@ protected:
Dialog *_messageDialog;
Dialog *_versionDialog;
- virtual int runDialog(Dialog &dialog);
+ virtual int runDialog(Dialog &dialog) override;
void confirmExitDialog();
void confirmRestartDialog();
void pauseDialog();
@@ -610,7 +610,7 @@ protected:
bool saveState(int slot, bool compat, Common::String &fileName);
bool loadState(int slot, bool compat);
bool loadState(int slot, bool compat, Common::String &fileName);
- virtual void saveLoadWithSerializer(Common::Serializer &s);
+ virtual void saveLoadWithSerializer(Common::Serializer &s) override;
void saveResource(Common::Serializer &ser, ResType type, ResId idx);
void loadResource(Common::Serializer &ser, ResType type, ResId idx);
void loadResourceOLD(Common::Serializer &ser, ResType type, ResId idx); // "Obsolete"
Commit: 2b90d1acba588601bd494b69ddcdb99de597548b
https://github.com/scummvm/scummvm/commit/2b90d1acba588601bd494b69ddcdb99de597548b
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-05T14:34:33+01:00
Commit Message:
ACCESS: Added override keywords
Changed paths:
engines/access/access.h
engines/access/detection.cpp
diff --git a/engines/access/access.h b/engines/access/access.h
index ad6b10e..3672f44 100644
--- a/engines/access/access.h
+++ b/engines/access/access.h
@@ -123,7 +123,7 @@ protected:
void playVideo(int videoNum, const Common::Point &pt);
// Engine APIs
- virtual Common::Error run();
+ virtual Common::Error run() override;
virtual bool hasFeature(EngineFeature f) const override;
protected:
/**
@@ -286,22 +286,22 @@ 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;
/**
* Returns true if a savegame can currently be loaded
*/
- bool canLoadGameStateCurrently();
+ bool canLoadGameStateCurrently() override;
/**
* Returns true if the game can currently be saved
*/
- bool canSaveGameStateCurrently();
+ bool canSaveGameStateCurrently() override;
/**
* Read in a savegame header
diff --git a/engines/access/detection.cpp b/engines/access/detection.cpp
index 34fbc6c..0b771f8 100644
--- a/engines/access/detection.cpp
+++ b/engines/access/detection.cpp
@@ -88,24 +88,24 @@ public:
_maxScanDepth = 3;
}
- virtual const char *getEngineId() const {
+ virtual const char *getEngineId() const override {
return "access";
}
- virtual const char *getName() const {
+ virtual const char *getName() const override {
return "Access";
}
- virtual const char *getOriginalCopyright() const {
+ virtual const char *getOriginalCopyright() const override {
return "Access Engine (C) 1989-1994 Access Software";
}
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 AccessMetaEngine::hasFeature(MetaEngineFeature f) const {
Commit: 4fd97dffe0096128c7a2e847407e9f97ba9f3f72
https://github.com/scummvm/scummvm/commit/4fd97dffe0096128c7a2e847407e9f97ba9f3f72
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-05T14:35:42+01:00
Commit Message:
ADL: Added override keywords
Changed paths:
engines/adl/adl.h
diff --git a/engines/adl/adl.h b/engines/adl/adl.h
index 021084b..8ae250e 100644
--- a/engines/adl/adl.h
+++ b/engines/adl/adl.h
@@ -249,9 +249,9 @@ protected:
AdlEngine(OSystem *syst, const AdlGameDescription *gd);
// Engine
- Common::Error loadGameState(int slot);
- Common::Error saveGameState(int slot, const Common::String &desc);
- bool canSaveGameStateCurrently();
+ Common::Error loadGameState(int slot) override;
+ Common::Error saveGameState(int slot, const Common::String &desc) override;
+ bool canSaveGameStateCurrently() override;
Common::String getDiskImageName(byte volume) const { return Adl::getDiskImageName(*_gameDescription, volume); }
GameType getGameType() const { return Adl::getGameType(*_gameDescription); }
@@ -445,16 +445,16 @@ private:
void setScriptDelay(uint scriptDelay) const { _scriptDelay = scriptDelay; }
Common::String getScriptLine() const;
// Engine
- Common::Error run();
+ Common::Error run() override;
bool hasFeature(EngineFeature f) const override;
- bool canLoadGameStateCurrently();
+ bool canLoadGameStateCurrently() override;
// Text input
byte convertKey(uint16 ascii) const;
Common::String getWord(const Common::String &line, uint &index) const;
Console *_console;
- GUI::Debugger *getDebugger() { return _console; }
+ GUI::Debugger *getDebugger() override { return _console; }
byte _saveVerb, _saveNoun, _restoreVerb, _restoreNoun;
};
Commit: cf755dc92101710b5cb57d3b4022cded08f3feb5
https://github.com/scummvm/scummvm/commit/cf755dc92101710b5cb57d3b4022cded08f3feb5
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-05T14:36:52+01:00
Commit Message:
AGI: Added override keywords
Changed paths:
engines/agi/agi.h
diff --git a/engines/agi/agi.h b/engines/agi/agi.h
index 17f8748..043463d 100644
--- a/engines/agi/agi.h
+++ b/engines/agi/agi.h
@@ -713,7 +713,7 @@ protected:
// Engine API
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)
@@ -786,8 +786,8 @@ public:
const char *getDiskName(uint16 id);
- bool canLoadGameStateCurrently();
- bool canSaveGameStateCurrently();
+ bool canLoadGameStateCurrently() override;
+ bool canSaveGameStateCurrently() override;
const byte *getFontData();
Commit: 14d7e5ac4da363663baaf255a7dbfc1b86cb6b05
https://github.com/scummvm/scummvm/commit/14d7e5ac4da363663baaf255a7dbfc1b86cb6b05
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-05T14:37:42+01:00
Commit Message:
AGOS: Added override keywords
Changed paths:
engines/agos/agos.h
diff --git a/engines/agos/agos.h b/engines/agos/agos.h
index 9f178b5..05ad2ad 100644
--- a/engines/agos/agos.h
+++ b/engines/agos/agos.h
@@ -216,17 +216,17 @@ protected:
// Engine APIs
Common::Error init();
virtual 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;
- virtual void syncSoundSettings();
- virtual void pauseEngineIntern(bool pause);
+ virtual void syncSoundSettings() override;
+ virtual void pauseEngineIntern(bool pause) override;
virtual void setupOpcodes();
uint16 _numOpcodes, _opcode;
Commit: 3f8280ce115e1037b9ed57b8634727c0908fbfec
https://github.com/scummvm/scummvm/commit/3f8280ce115e1037b9ed57b8634727c0908fbfec
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-05T14:40:11+01:00
Commit Message:
AVALANCHE: Added override keywords
Changed paths:
engines/avalanche/avalanche.h
engines/avalanche/detection.cpp
diff --git a/engines/avalanche/avalanche.h b/engines/avalanche/avalanche.h
index 3bbc339..96d7506 100644
--- a/engines/avalanche/avalanche.h
+++ b/engines/avalanche/avalanche.h
@@ -98,7 +98,7 @@ public:
~AvalancheEngine();
Common::ErrorCode initialize();
- GUI::Debugger *getDebugger();
+ GUI::Debugger *getDebugger() override;
Common::RandomSource *_rnd;
@@ -110,12 +110,12 @@ public:
const char *getCopyrightString() const;
void synchronize(Common::Serializer &sz);
- virtual bool canSaveGameStateCurrently();
- Common::Error saveGameState(int slot, const Common::String &desc);
+ virtual bool canSaveGameStateCurrently() override;
+ Common::Error saveGameState(int slot, const Common::String &desc) override;
bool saveGame(const int16 slot, const Common::String &desc);
Common::String getSaveFileName(const int slot);
- virtual bool canLoadGameStateCurrently();
- Common::Error loadGameState(int slot);
+ virtual bool canLoadGameStateCurrently() override;
+ Common::Error loadGameState(int slot) override;
bool loadGame(const int16 slot);
Common::String expandDate(int d, int m, int y);
uint32 getTimeInSeconds();
@@ -126,7 +126,7 @@ public:
protected:
// Engine APIs
- Common::Error run();
+ Common::Error run() override;
private:
AvalancheConsole *_console;
diff --git a/engines/avalanche/detection.cpp b/engines/avalanche/detection.cpp
index 625bc42..9ea9b64 100644
--- a/engines/avalanche/detection.cpp
+++ b/engines/avalanche/detection.cpp
@@ -78,25 +78,25 @@ public:
AvalancheMetaEngine() : AdvancedMetaEngine(gameDescriptions, sizeof(AvalancheGameDescription), avalancheGames) {
}
- const char *getEngineId() const {
+ const char *getEngineId() const override {
return "avalanche";
}
- const char *getName() const {
+ const char *getName() const override {
return "Avalanche";
}
- const char *getOriginalCopyright() const {
+ const char *getOriginalCopyright() const override {
return "Avalanche (C) 1994-1995 Mike, Mark and Thomas Thurman.";
}
- bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const;
+ bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const override;
bool hasFeature(MetaEngineFeature f) const override;
- int getMaximumSaveSlot() const { return 99; }
- SaveStateList listSaves(const char *target) const;
- void removeSaveState(const char *target, int slot) const;
- SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const;
+ int getMaximumSaveSlot() const override { return 99; }
+ SaveStateList listSaves(const char *target) const override;
+ void removeSaveState(const char *target, int slot) const override;
+ SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const override;
};
bool AvalancheMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *gd) const {
Commit: 79e13ed85f744f5c00968b9566b2bbc58f086ffa
https://github.com/scummvm/scummvm/commit/79e13ed85f744f5c00968b9566b2bbc58f086ffa
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-05T14:48:10+01:00
Commit Message:
BBVS: Added override keywords
Changed paths:
engines/bbvs/bbvs.h
engines/bbvs/detection.cpp
diff --git a/engines/bbvs/bbvs.h b/engines/bbvs/bbvs.h
index fdda2c8..b8171b8 100644
--- a/engines/bbvs/bbvs.h
+++ b/engines/bbvs/bbvs.h
@@ -218,7 +218,7 @@ static const int8 kWalkTurnTbl[] = {
class BbvsEngine : public Engine {
protected:
- Common::Error run();
+ Common::Error run() override;
virtual bool hasFeature(EngineFeature f) const override;
public:
BbvsEngine(OSystem *syst, const ADGameDescription *gd);
@@ -406,10 +406,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);
const char *getSavegameFilename(int num);
diff --git a/engines/bbvs/detection.cpp b/engines/bbvs/detection.cpp
index e53aa07..5f7dbaa 100644
--- a/engines/bbvs/detection.cpp
+++ b/engines/bbvs/detection.cpp
@@ -73,24 +73,24 @@ public:
_directoryGlobs = directoryGlobs;
}
- const char *getEngineId() const {
+ const char *getEngineId() const override {
return "bbvs";
}
- virtual const char *getName() const {
+ virtual const char *getName() const override {
return "MTV's Beavis and Butt-head in Virtual Stupidity";
}
- virtual const char *getOriginalCopyright() const {
+ virtual const char *getOriginalCopyright() const override {
return "(C) 1995 Viacom New Media";
}
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;
- SaveStateDescriptor querySaveMetaInfos(const char *target, int slot) const;
- virtual void removeSaveState(const char *target, int slot) const;
+ virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override;
+ virtual int getMaximumSaveSlot() const override;
+ 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 BbvsMetaEngine::hasFeature(MetaEngineFeature f) const {
Commit: fbaaba896096c7a609ee40692516ebc7d125313d
https://github.com/scummvm/scummvm/commit/fbaaba896096c7a609ee40692516ebc7d125313d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-05T14:50:20+01:00
Commit Message:
CGE: Added override keywords
Changed paths:
engines/cge/cge.h
diff --git a/engines/cge/cge.h b/engines/cge/cge.h
index c5e007d..d1b21e9 100644
--- a/engines/cge/cge.h
+++ b/engines/cge/cge.h
@@ -138,10 +138,10 @@ public:
CGEEngine(OSystem *syst, const ADGameDescription *gameDescription);
~CGEEngine();
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 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;
static const int _maxSceneArr[5];
bool _quitFlag;
@@ -205,8 +205,8 @@ public:
BitmapPtr *_miniShpList;
int _startGameSlot;
- virtual Common::Error run();
- GUI::Debugger *getDebugger() {
+ virtual Common::Error run() override;
+ GUI::Debugger *getDebugger() override {
return _console;
}
Commit: ba708682b29fa36c211974e3400d87b66348c401
https://github.com/scummvm/scummvm/commit/ba708682b29fa36c211974e3400d87b66348c401
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-05T14:51:32+01:00
Commit Message:
CGE2: Added override keywords
Changed paths:
engines/cge2/cge2.h
diff --git a/engines/cge2/cge2.h b/engines/cge2/cge2.h
index 72de1cb..fc07f09 100644
--- a/engines/cge2/cge2.h
+++ b/engines/cge2/cge2.h
@@ -157,15 +157,15 @@ private:
public:
CGE2Engine(OSystem *syst, const ADGameDescription *gameDescription);
virtual bool hasFeature(EngineFeature f) const override;
- virtual bool canSaveGameStateCurrently();
- virtual bool canLoadGameStateCurrently();
- virtual Common::Error saveGameState(int slot, const Common::String &desc);
- virtual Common::Error loadGameState(int slot);
- virtual Common::Error run();
+ 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;
+ virtual Common::Error run() override;
WARN_UNUSED_RESULT static bool readSavegameHeader(Common::InSaveFile *in, SavegameHeader &header, bool skipThumbnail = true);
- GUI::Debugger *getDebugger() {
+ GUI::Debugger *getDebugger() override {
return _console;
}
Commit: 716fca8894d0509965faf01ca247fdf34444bed3
https://github.com/scummvm/scummvm/commit/716fca8894d0509965faf01ca247fdf34444bed3
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-05T14:53:11+01:00
Commit Message:
CHEWY: Added override keywords
Changed paths:
engines/chewy/chewy.h
engines/chewy/detection.cpp
diff --git a/engines/chewy/chewy.h b/engines/chewy/chewy.h
index 997d123..3c88d9c 100644
--- a/engines/chewy/chewy.h
+++ b/engines/chewy/chewy.h
@@ -68,7 +68,7 @@ public:
protected:
// Engine APIs
- virtual Common::Error run();
+ virtual Common::Error run() override;
virtual bool hasFeature(EngineFeature f) const override;
void initialize();
diff --git a/engines/chewy/detection.cpp b/engines/chewy/detection.cpp
index 618b9e5..b41b467 100644
--- a/engines/chewy/detection.cpp
+++ b/engines/chewy/detection.cpp
@@ -117,24 +117,24 @@ public:
_directoryGlobs = directoryGlobs;
}
- const char *getEngineId() const {
+ const char *getEngineId() const override {
return "chewy";
}
- virtual const char *getName() const {
+ virtual const char *getName() const override {
return "Chewy: Esc from F5";
}
- virtual const char *getOriginalCopyright() const {
+ virtual const char *getOriginalCopyright() const override {
return "Chewy: Esc from F5 (C) 1995 New Generation Software";
}
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 ChewyMetaEngine::hasFeature(MetaEngineFeature f) const {
Commit: 1203705666edda3dd2489e1255381f85b455b603
https://github.com/scummvm/scummvm/commit/1203705666edda3dd2489e1255381f85b455b603
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-05T14:55:09+01:00
Commit Message:
CINE: Added override kyewords
Changed paths:
engines/cine/cine.h
engines/cine/detection.cpp
diff --git a/engines/cine/cine.h b/engines/cine/cine.h
index 044be29..0af37c9 100644
--- a/engines/cine/cine.h
+++ b/engines/cine/cine.h
@@ -103,7 +103,7 @@ class CineEngine : public Engine {
protected:
// Engine APIs
- virtual Common::Error run();
+ virtual Common::Error run() override;
virtual bool hasFeature(EngineFeature f) const override;
void shutdown();
@@ -114,7 +114,7 @@ public:
CineEngine(OSystem *syst, const CINEGameDescription *gameDesc);
virtual ~CineEngine();
- virtual void syncSoundSettings();
+ virtual void syncSoundSettings() override;
int getGameType() const;
uint32 getFeatures() const;
@@ -126,10 +126,10 @@ public:
int scummVMSaveLoadDialog(bool isSave);
int modifyGameSpeed(int speedChange);
int getTimerDelay() const;
- 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 CINEGameDescription *_gameDescription;
Common::File _partFileHandle;
@@ -140,7 +140,7 @@ public:
StringPtrHashMap _volumeEntriesMap;
TextHandler _textHandler;
- GUI::Debugger *getDebugger() { return _console; }
+ GUI::Debugger *getDebugger() override { return _console; }
bool _restartRequested;
diff --git a/engines/cine/detection.cpp b/engines/cine/detection.cpp
index 00c7ee4..d56db6a 100644
--- a/engines/cine/detection.cpp
+++ b/engines/cine/detection.cpp
@@ -75,27 +75,27 @@ public:
_guiOptions = GUIO2(GUIO_NOSPEECH, GAMEOPTION_ORIGINAL_SAVELOAD);
}
- const char *getEngineId() const {
+ const char *getEngineId() const override {
return "cine";
}
- virtual const char *getName() const {
+ virtual const char *getName() const override {
return "Cinematique evo 1";
}
- virtual const char *getOriginalCopyright() const {
+ virtual const char *getOriginalCopyright() const override {
return "Cinematique evo 1 (C) Delphine Software";
}
- 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 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 CineMetaEngine::hasFeature(MetaEngineFeature f) const {
Commit: da0452148087008b18f2a45a74dd12ff11377b19
https://github.com/scummvm/scummvm/commit/da0452148087008b18f2a45a74dd12ff11377b19
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-05T14:59:22+01:00
Commit Message:
CRUISE: Added override keywords
Changed paths:
engines/cruise/cruise.h
engines/cruise/detection.cpp
diff --git a/engines/cruise/cruise.h b/engines/cruise/cruise.h
index aac75c4..28c4ce7 100644
--- a/engines/cruise/cruise.h
+++ b/engines/cruise/cruise.h
@@ -71,7 +71,7 @@ private:
int processInput();
protected:
// Engine APIs
- virtual Common::Error run();
+ virtual Common::Error run() override;
void shutdown();
@@ -88,16 +88,16 @@ public:
Common::Language getLanguage() const;
Common::Platform getPlatform() const;
PCSound &sound() { return *_sound; }
- virtual GUI::Debugger *getDebugger() { return _debugger; }
+ virtual GUI::Debugger *getDebugger() override { return _debugger; }
virtual void pauseEngine(bool pause);
const char *langString(LangStringId langId) { return _langStrings[(int)langId].c_str(); }
static const char *getSavegameFile(int saveGameIdx);
- virtual Common::Error loadGameState(int slot);
- virtual bool canLoadGameStateCurrently();
- virtual Common::Error saveGameState(int slot, const Common::String &desc);
- virtual bool canSaveGameStateCurrently();
- virtual void syncSoundSettings();
+ 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 void syncSoundSettings() override;
const CRUISEGameDescription *_gameDescription;
void initAllData();
diff --git a/engines/cruise/detection.cpp b/engines/cruise/detection.cpp
index 78c9896..85b599e 100644
--- a/engines/cruise/detection.cpp
+++ b/engines/cruise/detection.cpp
@@ -198,24 +198,24 @@ public:
_guiOptions = GUIO2(GUIO_NOSPEECH, GUIO_NOMIDI);
}
- const char *getEngineId() const {
+ const char *getEngineId() const override {
return "cruise";
}
- virtual const char *getName() const {
+ virtual const char *getName() const override {
return "Cinematique evo 2";
}
- virtual const char *getOriginalCopyright() const {
+ virtual const char *getOriginalCopyright() const override {
return "Cinematique evo 2 (C) Delphine Software";
}
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 CruiseMetaEngine::hasFeature(MetaEngineFeature f) const {
Commit: 21b34f8861d0c7754e914e59534bbb7f9948011d
https://github.com/scummvm/scummvm/commit/21b34f8861d0c7754e914e59534bbb7f9948011d
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2020-02-05T14:59:35+01:00
Commit Message:
COMPOSER: Added override keywords
Changed paths:
engines/composer/composer.h
engines/composer/detection.cpp
diff --git a/engines/composer/composer.h b/engines/composer/composer.h
index a0b48db..a6f1f83 100644
--- a/engines/composer/composer.h
+++ b/engines/composer/composer.h
@@ -156,7 +156,7 @@ struct OldScript {
class ComposerEngine : public Engine {
protected:
- Common::Error run();
+ Common::Error run() override;
template <typename T>
void syncArray(Common::Serializer &ser, Common::Array<T> &data, Common::Serializer::Version minVersion = 0, Common::Serializer::Version maxVersion = Common::Serializer::kLastVersion);
@@ -166,10 +166,10 @@ protected:
void syncListReverse(Common::Serializer &ser, Common::List<T> &data, Common::Serializer::Version minVersion = 0, Common::Serializer::Version maxVersion = Common::Serializer::kLastVersion);
template <typename T>
void sync(Common::Serializer &ser, T &data, Common::Serializer::Version minVersion, Common::Serializer::Version maxVersion);
- bool canLoadGameStateCurrently() { return true; }
- Common::Error loadGameState(int slot);
- bool canSaveGameStateCurrently() { return true; }
- Common::Error saveGameState(int slot, const Common::String &desc);
+ bool canLoadGameStateCurrently() override { return true; }
+ Common::Error loadGameState(int slot) override;
+ bool canSaveGameStateCurrently() override { return true; }
+ Common::Error saveGameState(int slot, const Common::String &desc) override;
public:
ComposerEngine(OSystem *syst, const ComposerGameDescription *gameDesc);
@@ -187,7 +187,7 @@ public:
const ComposerGameDescription *_gameDescription;
Console *_console;
- GUI::Debugger *getDebugger() { return _console; }
+ GUI::Debugger *getDebugger() override { return _console; }
private:
Common::RandomSource *_rnd;
diff --git a/engines/composer/detection.cpp b/engines/composer/detection.cpp
index 7e62fac..61ba89f 100644
--- a/engines/composer/detection.cpp
+++ b/engines/composer/detection.cpp
@@ -721,22 +721,22 @@ public:
_directoryGlobs = directoryGlobs;
}
- const char *getEngineId() const {
+ const char *getEngineId() const override {
return "composer";
}
- virtual const char *getName() const {
+ virtual const char *getName() const override {
return "Magic Composer";
}
- virtual const char *getOriginalCopyright() const {
+ virtual const char *getOriginalCopyright() const override {
return "Copyright (C) 1995-1999 Animation Magic";
}
- 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 int getMaximumSaveSlot() const override;
+ virtual SaveStateList listSaves(const char* target) const override;
};
bool ComposerMetaEngine::createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const {
More information about the Scummvm-git-logs
mailing list