thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

MOHAWK: Added override clauses

Browse source
This commit is contained in:
Eugene Sandulenko 2018-03-28 12:28:27 +02:00
parent 283f7485e3
commit f54e528677
4 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
engines/mohawk/cstime.h
View file

@ -129,7 +129,7 @@ enum CSTimeState {
class MohawkEngine_CSTime : public MohawkEngine { class MohawkEngine_CSTime : public MohawkEngine {
protected: protected:
Common::Error run(); Common::Error run() override;
public: public:
MohawkEngine_CSTime(OSystem *syst, const MohawkGameDescription *gamedesc); MohawkEngine_CSTime(OSystem *syst, const MohawkGameDescription *gamedesc);
@ -142,7 +142,7 @@ public:
CSTimeGraphics *_gfx; CSTimeGraphics *_gfx;
bool _needsUpdate; bool _needsUpdate;
GUI::Debugger *getDebugger() { return _console; } GUI::Debugger *getDebugger() override { return _console; }
CSTimeView *getView() { return _view; } CSTimeView *getView() { return _view; }
CSTimeCase *getCase() { return _case; } CSTimeCase *getCase() { return _case; }
CSTimeInterface *getInterface() { return _interface; } CSTimeInterface *getInterface() { return _interface; }

2
engines/mohawk/dialogs.h
View file

@ -116,7 +116,7 @@ public:
virtual ~MystOptionsDialog(); virtual ~MystOptionsDialog();
virtual void open() override; virtual void open() override;
virtual void handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data); virtual void handleCommand(GUI::CommandSender *sender, uint32 cmd, uint32 data) override;
private: private:
MohawkEngine_Myst *_vm; MohawkEngine_Myst *_vm;

4
engines/mohawk/livingbooks.h
View file

@ -707,7 +707,7 @@ protected:
class MohawkEngine_LivingBooks : public MohawkEngine { class MohawkEngine_LivingBooks : public MohawkEngine {
protected: protected:
Common::Error run(); Common::Error run() override;
public: public:
MohawkEngine_LivingBooks(OSystem *syst, const MohawkGameDescription *gamedesc); MohawkEngine_LivingBooks(OSystem *syst, const MohawkGameDescription *gamedesc);
@ -725,7 +725,7 @@ public:
Common::SeekableSubReadStreamEndian *wrapStreamEndian(uint32 tag, uint16 id); Common::SeekableSubReadStreamEndian *wrapStreamEndian(uint32 tag, uint16 id);
Common::String readString(Common::ReadStream *stream); Common::String readString(Common::ReadStream *stream);
Common::Rect readRect(Common::ReadStreamEndian *stream); Common::Rect readRect(Common::ReadStreamEndian *stream);
GUI::Debugger *getDebugger() { return _console; } GUI::Debugger *getDebugger() override { return _console; }
void addArchive(Archive *archive); void addArchive(Archive *archive);
void removeArchive(Archive *archive); void removeArchive(Archive *archive);

14
engines/mohawk/riven.h
View file

@ -79,7 +79,7 @@ typedef Common::HashMap<Common::String, uint32, Common::IgnoreCase_Hash, Common:
class MohawkEngine_Riven : public MohawkEngine { class MohawkEngine_Riven : public MohawkEngine {
protected: protected:
Common::Error run(); Common::Error run() override;
public: public:
MohawkEngine_Riven(OSystem *syst, const MohawkGameDescription *gamedesc); MohawkEngine_Riven(OSystem *syst, const MohawkGameDescription *gamedesc);
@ -95,13 +95,13 @@ public:
// Display debug rectangles around the hotspots // Display debug rectangles around the hotspots
bool _showHotspots; bool _showHotspots;
GUI::Debugger *getDebugger(); GUI::Debugger *getDebugger() override;
bool canLoadGameStateCurrently(); bool canLoadGameStateCurrently() override;
bool canSaveGameStateCurrently(); bool canSaveGameStateCurrently() override;
Common::Error loadGameState(int slot); Common::Error loadGameState(int slot) override;
Common::Error saveGameState(int slot, const Common::String &desc); Common::Error saveGameState(int slot, const Common::String &desc) override;
bool hasFeature(EngineFeature f) const; bool hasFeature(EngineFeature f) const override;
void doFrame(); void doFrame();