libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-03 17:33:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MOHAWK: Add override qualifiers to the Myst code

Browse Source
This commit is contained in:
Bastien Bouclet 2016-02-06 11:21:00 +01:00
parent 25330c714e
commit ce25cdf8dc
15 changed files with 77 additions and 77 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
engines/mohawk/myst.h
View File

@ -158,13 +158,13 @@ struct MystCursorHint {
class MohawkEngine_Myst : public MohawkEngine {
protected:
Common::Error run();
Common::Error run() override;
public:
MohawkEngine_Myst(OSystem *syst, const MohawkGameDescription *gamedesc);
virtual ~MohawkEngine_Myst();
Common::SeekableReadStream *getResource(uint32 tag, uint16 id);
Common::SeekableReadStream *getResource(uint32 tag, uint16 id) override;
Common::String wrapMovieFilename(const Common::String &movieName, uint16 stack);
@ -203,13 +203,13 @@ public:
void setCacheState(bool state) { _cache.enabled = state; }
bool getCacheState() { return _cache.enabled; }
GUI::Debugger *getDebugger() { return _console; }
GUI::Debugger *getDebugger() override { return _console; }
bool canLoadGameStateCurrently();
bool canSaveGameStateCurrently();
Common::Error loadGameState(int slot);
Common::Error saveGameState(int slot, const Common::String &desc);
bool hasFeature(EngineFeature f) const;
bool canLoadGameStateCurrently() override;
bool canSaveGameStateCurrently() override;
Common::Error loadGameState(int slot) override;
Common::Error saveGameState(int slot, const Common::String &desc) override;
bool hasFeature(EngineFeature f) const override;
private:
MystConsole *_console;

38
engines/mohawk/myst_areas.h
View File

@ -95,8 +95,8 @@ protected:
class MystResourceType5 : public MystResource {
public:
MystResourceType5(MohawkEngine_Myst *vm, Common::SeekableReadStream *rlstStream, MystResource *parent);
void handleMouseUp();
const Common::String describe();
void handleMouseUp() override;
const Common::String describe() override;
protected:
MystScript _script;
@ -106,7 +106,7 @@ class MystResourceType6 : public MystResourceType5 {
public:
MystResourceType6(MohawkEngine_Myst *vm, Common::SeekableReadStream *rlstStream, MystResource *parent);
VideoHandle playMovie();
void handleCardChange();
void handleCardChange() override;
bool isPlaying();
void setDirection(int16 direction) { _direction = direction; }
void setBlocking(bool blocking) { _playBlocking = blocking; }
@ -129,11 +129,11 @@ public:
MystResourceType7(MohawkEngine_Myst *vm, Common::SeekableReadStream *rlstStream, MystResource *parent);
virtual ~MystResourceType7();
virtual void drawDataToScreen();
virtual void handleCardChange();
virtual void drawDataToScreen() override;
virtual void handleCardChange() override;
virtual void handleMouseUp();
virtual void handleMouseDown();
virtual void handleMouseUp() override;
virtual void handleMouseDown() override;
MystResource *getSubResource(uint16 index) { return _subResources[index]; }
protected:
@ -146,11 +146,11 @@ class MystResourceType8 : public MystResourceType7 {
public:
MystResourceType8(MohawkEngine_Myst *vm, Common::SeekableReadStream *rlstStream, MystResource *parent);
virtual ~MystResourceType8();
virtual const Common::String describe();
virtual const Common::String describe() override;
virtual void drawDataToScreen();
virtual void drawDataToScreen() override;
void drawConditionalDataToScreen(uint16 state, bool update = true);
uint16 getType8Var();
uint16 getType8Var() override;
struct SubImage {
uint16 wdib;
@ -168,11 +168,11 @@ class MystResourceType11 : public MystResourceType8 {
public:
MystResourceType11(MohawkEngine_Myst *vm, Common::SeekableReadStream *rlstStream, MystResource *parent);
virtual ~MystResourceType11();
const Common::String describe();
const Common::String describe() override;
virtual void handleMouseDown();
virtual void handleMouseUp();
virtual void handleMouseDrag();
virtual void handleMouseDown() override;
virtual void handleMouseUp() override;
virtual void handleMouseDrag() override;
uint16 getList1(uint16 index);
uint16 getList2(uint16 index);
@ -209,9 +209,9 @@ public:
MystResourceType10(MohawkEngine_Myst *vm, Common::SeekableReadStream *rlstStream, MystResource *parent);
virtual ~MystResourceType10();
void handleMouseDown();
void handleMouseUp();
void handleMouseDrag();
void handleMouseDown() override;
void handleMouseUp() override;
void handleMouseDrag() override;
void setStep(uint16 step);
void setPosition(uint16 pos);
void restoreBackground();
@ -246,9 +246,9 @@ private:
class MystResourceType13 : public MystResource {
public:
MystResourceType13(MohawkEngine_Myst *vm, Common::SeekableReadStream *rlstStream, MystResource *parent);
const Common::String describe();
const Common::String describe() override;
void handleMouseUp();
void handleMouseUp() override;
void handleMouseEnter();
void handleMouseLeave();

4
engines/mohawk/myst_graphics.h
View File

@ -61,8 +61,8 @@ public:
const byte *getPalette() const { return _palette; }
protected:
MohawkSurface *decodeImage(uint16 id);
MohawkEngine *getVM() { return (MohawkEngine *)_vm; }
MohawkSurface *decodeImage(uint16 id) override;
MohawkEngine *getVM() override { return (MohawkEngine *)_vm; }
private:
MohawkEngine_Myst *_vm;

12
engines/mohawk/myst_stacks/channelwood.h
View File

@ -40,16 +40,16 @@ public:
Channelwood(MohawkEngine_Myst *vm);
~Channelwood();
void disablePersistentScripts();
void runPersistentScripts();
void disablePersistentScripts() override;
void runPersistentScripts() override;
private:
void setupOpcodes();
uint16 getVar(uint16 var);
void toggleVar(uint16 var);
bool setVarValue(uint16 var, uint16 value);
uint16 getVar(uint16 var) override;
void toggleVar(uint16 var) override;
bool setVarValue(uint16 var, uint16 value) override;
virtual uint16 getMap() { return 9932; }
virtual uint16 getMap() override { return 9932; }
DECLARE_OPCODE(o_bridgeToggle);
DECLARE_OPCODE(o_pipeExtend);

6
engines/mohawk/myst_stacks/credits.h
View File

@ -40,12 +40,12 @@ public:
Credits(MohawkEngine_Myst *vm);
~Credits();
void disablePersistentScripts();
void runPersistentScripts();
void disablePersistentScripts() override;
void runPersistentScripts() override;
private:
void setupOpcodes();
uint16 getVar(uint16 var);
uint16 getVar(uint16 var) override;
DECLARE_OPCODE(o_runCredits);

4
engines/mohawk/myst_stacks/demo.h
View File

@ -40,8 +40,8 @@ public:
Demo(MohawkEngine_Myst *vm);
~Demo();
void disablePersistentScripts();
void runPersistentScripts();
void disablePersistentScripts() override;
void runPersistentScripts() override;
private:
void setupOpcodes();

6
engines/mohawk/myst_stacks/dni.h
View File

@ -40,12 +40,12 @@ public:
Dni(MohawkEngine_Myst *vm);
~Dni();
void disablePersistentScripts();
void runPersistentScripts();
void disablePersistentScripts() override;
void runPersistentScripts() override;
private:
void setupOpcodes();
uint16 getVar(uint16 var);
uint16 getVar(uint16 var) override;
void atrus_run();
void loopVideo_run();

6
engines/mohawk/myst_stacks/intro.h
View File

@ -41,12 +41,12 @@ public:
Intro(MohawkEngine_Myst *vm);
~Intro();
void disablePersistentScripts();
void runPersistentScripts();
void disablePersistentScripts() override;
void runPersistentScripts() override;
private:
void setupOpcodes();
uint16 getVar(uint16 var);
uint16 getVar(uint16 var) override;
DECLARE_OPCODE(o_useLinkBook);

4
engines/mohawk/myst_stacks/makingof.h
View File

@ -40,8 +40,8 @@ public:
MakingOf(MohawkEngine_Myst *vm);
~MakingOf();
void disablePersistentScripts();
void runPersistentScripts();
void disablePersistentScripts() override;
void runPersistentScripts() override;
private:
void setupOpcodes();

12
engines/mohawk/myst_stacks/mechanical.h
View File

@ -40,16 +40,16 @@ public:
Mechanical(MohawkEngine_Myst *vm);
~Mechanical();
void disablePersistentScripts();
void runPersistentScripts();
void disablePersistentScripts() override;
void runPersistentScripts() override;
private:
void setupOpcodes();
uint16 getVar(uint16 var);
void toggleVar(uint16 var);
bool setVarValue(uint16 var, uint16 value);
uint16 getVar(uint16 var) override;
void toggleVar(uint16 var) override;
bool setVarValue(uint16 var, uint16 value) override;
virtual uint16 getMap() { return 9931; }
virtual uint16 getMap() override { return 9931; }
void birdSing_run();
void elevatorRotation_run();

12
engines/mohawk/myst_stacks/myst.h
View File

@ -40,16 +40,16 @@ public:
Myst(MohawkEngine_Myst *vm);
~Myst();
virtual void disablePersistentScripts();
virtual void runPersistentScripts();
virtual void disablePersistentScripts() override;
virtual void runPersistentScripts() override;
protected:
void setupOpcodes();
uint16 getVar(uint16 var);
void toggleVar(uint16 var);
bool setVarValue(uint16 var, uint16 value);
uint16 getVar(uint16 var) override;
void toggleVar(uint16 var) override;
bool setVarValue(uint16 var, uint16 value) override;
virtual uint16 getMap() { return 9934; }
virtual uint16 getMap() override { return 9934; }
void towerRotationMap_run();
virtual void libraryBookcaseTransform_run();

6
engines/mohawk/myst_stacks/preview.h
View File

@ -40,8 +40,8 @@ public:
Preview(MohawkEngine_Myst *vm);
~Preview();
void disablePersistentScripts();
void runPersistentScripts();
void disablePersistentScripts() override;
void runPersistentScripts() override;
private:
void setupOpcodes();
@ -67,7 +67,7 @@ private:
void speech_run();
void speechUpdateCue();
void libraryBookcaseTransform_run();
void libraryBookcaseTransform_run() override;
};
} // End of namespace MystStacks

12
engines/mohawk/myst_stacks/selenitic.h
View File

@ -41,16 +41,16 @@ public:
Selenitic(MohawkEngine_Myst *vm);
~Selenitic();
void disablePersistentScripts();
void runPersistentScripts();
void disablePersistentScripts() override;
void runPersistentScripts() override;
private:
void setupOpcodes();
uint16 getVar(uint16 var);
void toggleVar(uint16 var);
bool setVarValue(uint16 var, uint16 value);
uint16 getVar(uint16 var) override;
void toggleVar(uint16 var) override;
bool setVarValue(uint16 var, uint16 value) override;
virtual uint16 getMap() { return 9930; }
virtual uint16 getMap() override { return 9930; }
DECLARE_OPCODE(o_mazeRunnerMove);
DECLARE_OPCODE(o_mazeRunnerSoundRepeat);

4
engines/mohawk/myst_stacks/slides.h
View File

@ -40,8 +40,8 @@ public:
Slides(MohawkEngine_Myst *vm);
~Slides();
void disablePersistentScripts();
void runPersistentScripts();
void disablePersistentScripts() override;
void runPersistentScripts() override;
private:
void setupOpcodes();

12
engines/mohawk/myst_stacks/stoneship.h
View File

@ -40,16 +40,16 @@ public:
Stoneship(MohawkEngine_Myst *vm);
~Stoneship();
void disablePersistentScripts();
void runPersistentScripts();
void disablePersistentScripts() override;
void runPersistentScripts() override;
private:
void setupOpcodes();
uint16 getVar(uint16 var);
void toggleVar(uint16 var);
bool setVarValue(uint16 var, uint16 value);
uint16 getVar(uint16 var) override;
void toggleVar(uint16 var) override;
bool setVarValue(uint16 var, uint16 value) override;
virtual uint16 getMap() { return 9933; }
virtual uint16 getMap() override { return 9933; }
DECLARE_OPCODE(o_pumpTurnOff);
DECLARE_OPCODE(o_brotherDoorOpen);