diff --git a/engines/mads/debugger.h b/engines/mads/debugger.h index f6b58ac0de6..8747d6412f8 100644 --- a/engines/mads/debugger.h +++ b/engines/mads/debugger.h @@ -56,7 +56,7 @@ public: bool _showMousePos; public: Debugger(MADSEngine *vm); - virtual ~Debugger() {} + ~Debugger() override {} }; } // End of namespace MADS diff --git a/engines/mads/detection.cpp b/engines/mads/detection.cpp index a56b303cf8d..d2e57d67344 100644 --- a/engines/mads/detection.cpp +++ b/engines/mads/detection.cpp @@ -159,23 +159,23 @@ public: _maxScanDepth = 3; } - virtual const char *getEngineId() const override { + const char *getEngineId() const override { return "mads"; } - virtual const char *getName() const override { + const char *getName() const override { return "MADS"; } - virtual const char *getOriginalCopyright() const override { + const char *getOriginalCopyright() const override { return "MADS (C) Microprose"; } - virtual bool hasFeature(MetaEngineFeature f) const override; - 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 hasFeature(MetaEngineFeature f) const override; + bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override; + SaveStateList listSaves(const char *target) const override; + 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/mads/dialogs.h b/engines/mads/dialogs.h index e2db2d8940f..d0eab9f1e47 100644 --- a/engines/mads/dialogs.h +++ b/engines/mads/dialogs.h @@ -134,7 +134,7 @@ protected: /** * Calculate the bounds for the dialog */ - virtual void calculateBounds(); + void calculateBounds() override; public: /** * Constructor @@ -160,12 +160,12 @@ public: /** * Destructor */ - virtual ~TextDialog(); + ~TextDialog() override; /** * Draw the dialog */ - virtual void draw(); + void draw() override; /** * Draw the dialog along with any input box @@ -224,7 +224,7 @@ class MessageDialog : public TextDialog { public: MessageDialog(MADSEngine *vm, int lines, ...); - virtual ~MessageDialog() {} + ~MessageDialog() override {} }; enum DialogId { @@ -286,7 +286,7 @@ public: */ FullScreenDialog(MADSEngine *vm); - virtual ~FullScreenDialog(); + ~FullScreenDialog() override; }; } // End of namespace MADS diff --git a/engines/mads/dragonsphere/dragonsphere_scenes.h b/engines/mads/dragonsphere/dragonsphere_scenes.h index 22d894b9d91..93c37730691 100644 --- a/engines/mads/dragonsphere/dragonsphere_scenes.h +++ b/engines/mads/dragonsphere/dragonsphere_scenes.h @@ -647,9 +647,9 @@ public: class SceneInfoDragonsphere : public SceneInfo { friend class SceneInfo; protected: - virtual void loadCodes(BaseSurface &depthSurface, int variant); + void loadCodes(BaseSurface &depthSurface, int variant) override; - virtual void loadCodes(BaseSurface &depthSurface, Common::SeekableReadStream *stream); + void loadCodes(BaseSurface &depthSurface, Common::SeekableReadStream *stream) override; /** * Constructor @@ -664,9 +664,9 @@ public: warning("Unimplemented scene"); } - virtual void setup() {} - virtual void enter() {} - virtual void actions() {} + void setup() override {} + void enter() override {} + void actions() override {} }; } // End of namespace Dragonsphere diff --git a/engines/mads/dragonsphere/dragonsphere_scenes1.h b/engines/mads/dragonsphere/dragonsphere_scenes1.h index e9f71328aa5..4c3983311b6 100644 --- a/engines/mads/dragonsphere/dragonsphere_scenes1.h +++ b/engines/mads/dragonsphere/dragonsphere_scenes1.h @@ -56,13 +56,13 @@ public: class Scene101 : public Scene1xx { public: Scene101(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene102 : public Scene1xx { @@ -74,25 +74,25 @@ private: public: Scene102(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene103 : public Scene1xx { public: Scene103(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene104 : public Scene1xx { @@ -143,13 +143,13 @@ private: public: Scene104(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene105 : public Scene1xx { @@ -173,13 +173,13 @@ private: public: Scene105(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; } // End of namespace Dragonsphere diff --git a/engines/mads/dragonsphere/game_dragonsphere.h b/engines/mads/dragonsphere/game_dragonsphere.h index b9eb86af646..6bd6d5d941b 100644 --- a/engines/mads/dragonsphere/game_dragonsphere.h +++ b/engines/mads/dragonsphere/game_dragonsphere.h @@ -93,26 +93,26 @@ class GameDragonsphere : public Game { protected: GameDragonsphere(MADSEngine *vm); - virtual void startGame(); + void startGame() override; - virtual void initializeGlobals(); + void initializeGlobals() override; - virtual void setSectionHandler(); + void setSectionHandler() override; - virtual void checkShowDialog(); + void checkShowDialog() override; public: DragonsphereGlobals _globals; StoryMode _storyMode; - virtual Globals &globals() { return _globals; } + Globals &globals() override { return _globals; } - virtual void doObjectAction(); + void doObjectAction() override; - virtual void unhandledAction(); + void unhandledAction() override; - virtual void step(); + void step() override; - virtual void synchronize(Common::Serializer &s, bool phase1); + void synchronize(Common::Serializer &s, bool phase1) override; }; @@ -121,9 +121,9 @@ public: Section1Handler(MADSEngine *vm) : SectionHandler(vm) {} // TODO: Properly implement handler methods - virtual void preLoadSection() {} - virtual void sectionPtr2() {} - virtual void postLoadSection() {} + void preLoadSection() override {} + void sectionPtr2() override {} + void postLoadSection() override {} }; // TODO: Properly implement handler classes diff --git a/engines/mads/mads.h b/engines/mads/mads.h index 327fe058d04..240119545fd 100644 --- a/engines/mads/mads.h +++ b/engines/mads/mads.h @@ -89,8 +89,8 @@ private: void loadOptions(); protected: // Engine APIs - virtual Common::Error run() override; - virtual bool hasFeature(EngineFeature f) const override; + Common::Error run() override; + bool hasFeature(EngineFeature f) const override; public: Debugger *_debugger; Dialogs *_dialogs; @@ -113,7 +113,7 @@ public: bool _disableFastwalk; public: MADSEngine(OSystem *syst, const MADSGameDescription *gameDesc); - virtual ~MADSEngine(); + ~MADSEngine() override; uint32 getFeatures() const; Common::Language getLanguage() const; @@ -145,17 +145,17 @@ public: /** * Handles loading a game via the GMM */ - virtual Common::Error loadGameState(int slot) override; + Common::Error loadGameState(int slot) override; /** * Handles saving the game via the GMM */ - virtual Common::Error saveGameState(int slot, const Common::String &desc) override; + Common::Error saveGameState(int slot, const Common::String &desc) override; /** * Handles updating sound settings after they're changed in the GMM dialog */ - virtual void syncSoundSettings() override; + void syncSoundSettings() override; void saveOptions(); }; diff --git a/engines/mads/menu_views.h b/engines/mads/menu_views.h index e22b6223a74..0383206bc2e 100644 --- a/engines/mads/menu_views.h +++ b/engines/mads/menu_views.h @@ -40,16 +40,16 @@ protected: virtual void doFrame() = 0; - virtual void display(); + void display() override; /** * Event handler */ - virtual bool onEvent(Common::Event &event); + bool onEvent(Common::Event &event) override; public: MenuView(MADSEngine *vm); - virtual ~MenuView() {} + ~MenuView() override {} virtual void show(); @@ -114,9 +114,9 @@ private: */ void resetPalette(); protected: - virtual void display(); + void display() override; - virtual void doFrame(); + void doFrame() override; /** * Called when the script is finished @@ -130,7 +130,7 @@ public: TextView(MADSEngine *vm); - virtual ~TextView(); + ~TextView() override; }; enum ResyncMode { NEVER, ALWAYS, BEGINNING }; @@ -210,11 +210,11 @@ private: void scroll(); protected: - virtual void display(); + void display() override; - virtual void doFrame(); + void doFrame() override; - virtual bool onEvent(Common::Event &event); + bool onEvent(Common::Event &event) override; virtual void scriptDone(); public: @@ -225,7 +225,7 @@ public: AnimationView(MADSEngine *vm); - virtual ~AnimationView(); + ~AnimationView() override; }; } // End of namespace MADS diff --git a/engines/mads/msurface.h b/engines/mads/msurface.h index 5b5a1d62c1b..4f4071dd954 100644 --- a/engines/mads/msurface.h +++ b/engines/mads/msurface.h @@ -86,7 +86,7 @@ public: /** * Destructor */ - virtual ~BaseSurface() {} + ~BaseSurface() override {} /** * Return a rect containing the bounds of the surface @@ -175,7 +175,7 @@ protected: * Override the addDirtyRect from Graphics::Screen, since for standard * surfaces we don't need dirty rects to be tracked */ - virtual void addDirtyRect(const Common::Rect &r) {} + void addDirtyRect(const Common::Rect &r) override {} public: MSurface() : BaseSurface() {} MSurface(int width, int height) : BaseSurface(width, height) {} diff --git a/engines/mads/nebular/dialogs_nebular.h b/engines/mads/nebular/dialogs_nebular.h index 4935ee4b8c9..b7ca583516d 100644 --- a/engines/mads/nebular/dialogs_nebular.h +++ b/engines/mads/nebular/dialogs_nebular.h @@ -41,7 +41,7 @@ private: DialogsNebular(MADSEngine *vm): Dialogs(vm), _capitalizationMode(kUppercase), _dialogWidth(0) {} - virtual Common::String getVocab(int vocabId); + Common::String getVocab(int vocabId) override; bool textNoun(Common::String &dest, int nounId, const Common::String &source); @@ -51,11 +51,11 @@ private: void showScummVMRestoreDialog(); public: - virtual void showDialog(); + void showDialog() override; - virtual void showItem(int objectId, int messageId, int speech = -1); + void showItem(int objectId, int messageId, int speech = -1) override; - virtual bool show(int messageId, int objectId = -1); + bool show(int messageId, int objectId = -1) override; }; struct HOGANUS { @@ -84,7 +84,7 @@ public: /** * Show the dialog */ - virtual void show(); + void show() override; bool isCorrectAnswer(); }; @@ -97,13 +97,13 @@ private: uint32 _palFlags[PALETTE_COUNT]; RGBList _rgbList; protected: - virtual void save(); + void save() override; - virtual void restore(); + void restore() override; public: PictureDialog(MADSEngine *vm, const Common::Point &pos, int maxChars, int objectId); - virtual ~PictureDialog(); + ~PictureDialog() override; }; enum DialogTextAlign { ALIGN_NONE = 0, ALIGN_CENTER = -1, ALIGN_AT_CENTER = -2, ALIGN_RIGHT = -3 }; @@ -137,7 +137,7 @@ protected: /** * Display the dialog */ - virtual void display(); + void display() override; /** * Reset the lines list for the dialog @@ -192,7 +192,7 @@ public: /** * Destructor */ - virtual ~GameDialog(); + ~GameDialog() override; /** * Show the dialog @@ -212,12 +212,12 @@ public: /** * Display the dialog */ - virtual void display(); + void display() override; /** * Show the dialog */ - virtual void show(); + void show() override; }; class GameMenuDialog : public GameDialog { @@ -232,12 +232,12 @@ public: /** * Display the dialog */ - virtual void display(); + void display() override; /** * Show the dialog */ - virtual void show(); + void show() override; }; class OptionsDialog : public GameDialog { @@ -257,12 +257,12 @@ public: /** * Display the dialog */ - virtual void display(); + void display() override; /** * Show the dialog */ - virtual void show(); + void show() override; }; } // End of namespace Nebular diff --git a/engines/mads/nebular/game_nebular.h b/engines/mads/nebular/game_nebular.h index 3cf7aefc18f..3d0b31472d8 100644 --- a/engines/mads/nebular/game_nebular.h +++ b/engines/mads/nebular/game_nebular.h @@ -108,32 +108,32 @@ private: protected: GameNebular(MADSEngine *vm); - virtual void startGame(); + void startGame() override; - virtual void initializeGlobals(); + void initializeGlobals() override; - virtual void setSectionHandler(); + void setSectionHandler() override; - virtual void checkShowDialog(); + void checkShowDialog() override; public: NebularGlobals _globals; StoryMode _storyMode; Difficulty _difficulty; - virtual Globals &globals() { return _globals; } + Globals &globals() override { return _globals; } - virtual void doObjectAction(); + void doObjectAction() override; void showRecipe(); - virtual void unhandledAction(); + void unhandledAction() override; - virtual void step(); + void step() override; - virtual void synchronize(Common::Serializer &s, bool phase1); + void synchronize(Common::Serializer &s, bool phase1) override; - virtual void setNaughtyMode(bool naughtyMode) { _storyMode = naughtyMode ? STORYMODE_NAUGHTY : STORYMODE_NICE; } - virtual bool getNaughtyMode() const { return _storyMode == STORYMODE_NAUGHTY; } + void setNaughtyMode(bool naughtyMode) override { _storyMode = naughtyMode ? STORYMODE_NAUGHTY : STORYMODE_NICE; } + bool getNaughtyMode() const override { return _storyMode == STORYMODE_NAUGHTY; } }; // Section handlers aren't needed in ScummVM implementation @@ -141,9 +141,9 @@ class Section1Handler : public SectionHandler { public: Section1Handler(MADSEngine *vm) : SectionHandler(vm) {} - virtual void preLoadSection() {} - virtual void sectionPtr2() {} - virtual void postLoadSection() {} + void preLoadSection() override {} + void sectionPtr2() override {} + void postLoadSection() override {} }; typedef Section1Handler Section2Handler; diff --git a/engines/mads/nebular/menu_nebular.h b/engines/mads/nebular/menu_nebular.h index d44b5f20228..ecde95bc646 100644 --- a/engines/mads/nebular/menu_nebular.h +++ b/engines/mads/nebular/menu_nebular.h @@ -99,21 +99,21 @@ protected: /** * Display the menu */ - virtual void display(); + void display() override; /** * Handle the menu item animations */ - virtual void doFrame(); + void doFrame() override; /** * Event handler */ - virtual bool onEvent(Common::Event &event); + bool onEvent(Common::Event &event) override; public: MainMenu(MADSEngine *vm); - virtual ~MainMenu(); + ~MainMenu() override; }; class AdvertView : public EventTarget { @@ -131,11 +131,11 @@ protected: /** * Event handler */ - virtual bool onEvent(Common::Event &event); + bool onEvent(Common::Event &event) override; public: AdvertView(MADSEngine *vm); - virtual ~AdvertView() {} + ~AdvertView() override {} /** * Show the dialog @@ -145,7 +145,7 @@ public: class RexAnimationView : public AnimationView { protected: - virtual void scriptDone(); + void scriptDone() override; public: RexAnimationView(MADSEngine *vm) : AnimationView(vm) {} }; diff --git a/engines/mads/nebular/nebular_scenes.h b/engines/mads/nebular/nebular_scenes.h index b600c6dbe10..298b32c20b7 100644 --- a/engines/mads/nebular/nebular_scenes.h +++ b/engines/mads/nebular/nebular_scenes.h @@ -1373,9 +1373,9 @@ public: class SceneInfoNebular : public SceneInfo { friend class SceneInfo; protected: - virtual void loadCodes(BaseSurface &depthSurface, int variant); + void loadCodes(BaseSurface &depthSurface, int variant) override; - virtual void loadCodes(BaseSurface &depthSurface, Common::SeekableReadStream *stream); + void loadCodes(BaseSurface &depthSurface, Common::SeekableReadStream *stream) override; /** * Constructor diff --git a/engines/mads/nebular/nebular_scenes1.h b/engines/mads/nebular/nebular_scenes1.h index d8c90598468..24e2460ab56 100644 --- a/engines/mads/nebular/nebular_scenes1.h +++ b/engines/mads/nebular/nebular_scenes1.h @@ -68,13 +68,13 @@ private: public: Scene101(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene102 : public Scene1xx { @@ -92,14 +92,14 @@ private: public: Scene102(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); - virtual void postActions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; + void postActions() override; }; class Scene103 : public Scene1xx { @@ -108,13 +108,13 @@ private: public: Scene103(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void actions(); - virtual void postActions(); + void setup() override; + void enter() override; + void step() override; + void actions() override; + void postActions() override; }; class Scene104 : public Scene1xx { @@ -124,13 +124,13 @@ private: public: Scene104(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene105 : public Scene1xx { @@ -139,13 +139,13 @@ private: public: Scene105(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene106 : public Scene1xx { @@ -158,13 +158,13 @@ private: public: Scene106(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene107 : public Scene1xx { @@ -173,23 +173,23 @@ private: public: Scene107(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene108 : public Scene1xx { public: Scene108(MADSEngine *vm) : Scene1xx(vm) {} - virtual void setup(); - virtual void enter(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void preActions() override; + void actions() override; }; class Scene109 : public Scene1xx { @@ -206,13 +206,13 @@ private: public: Scene109(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene110 : public Scene1xx { @@ -221,13 +221,13 @@ private: public: Scene110(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene111 : public Scene1xx { @@ -239,23 +239,23 @@ private: public: Scene111(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene112 : public Scene1xx { public: Scene112(MADSEngine *vm) : Scene1xx(vm) {} - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void actions() {}; + void setup() override; + void enter() override; + void step() override; + void actions() override {}; }; } // End of namespace Nebular diff --git a/engines/mads/nebular/nebular_scenes2.h b/engines/mads/nebular/nebular_scenes2.h index 0ea4702eea7..8205ba6393f 100644 --- a/engines/mads/nebular/nebular_scenes2.h +++ b/engines/mads/nebular/nebular_scenes2.h @@ -55,12 +55,12 @@ private: public: Scene201(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void actions() override; }; class Scene202 : public Scene2xx { @@ -77,13 +77,13 @@ private: public: Scene202(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; void setRandomKernelMessage(); }; @@ -94,13 +94,13 @@ private: public: Scene203(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene205 : public Scene2xx { @@ -114,12 +114,12 @@ private: public: Scene205(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void actions() override; }; class Scene207 : public Scene2xx { @@ -133,13 +133,13 @@ private: public: Scene207(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene208 : public Scene2xx { @@ -152,13 +152,13 @@ private: public: Scene208(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene209 : public Scene2xx { @@ -198,13 +198,13 @@ private: public: Scene209(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene210 : public Scene2xx { @@ -237,13 +237,13 @@ private: public: Scene210(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene211 : public Scene2xx { @@ -254,33 +254,33 @@ private: public: Scene211(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene212 : public Scene2xx { public: Scene212(MADSEngine *vm) : Scene2xx(vm) {} - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene213 : public SceneTeleporter { public: Scene213(MADSEngine *vm) : SceneTeleporter(vm) {} - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void actions() override; }; class Scene214 : public Scene2xx { @@ -290,32 +290,32 @@ private: public: Scene214(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void actions() override; }; class Scene215 : public Scene2xx { public: Scene215(MADSEngine *vm) : Scene2xx(vm) {} - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void actions() override; }; class Scene216 : public Scene2xx { public: Scene216(MADSEngine *vm) : Scene2xx(vm) {} - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void actions() {}; + void setup() override; + void enter() override; + void step() override; + void actions() override {}; }; } // End of namespace Nebular diff --git a/engines/mads/nebular/nebular_scenes3.h b/engines/mads/nebular/nebular_scenes3.h index af75b14193c..d4288cf2356 100644 --- a/engines/mads/nebular/nebular_scenes3.h +++ b/engines/mads/nebular/nebular_scenes3.h @@ -78,23 +78,23 @@ protected: public: Scene3xx(MADSEngine *vm) : NebularScene(vm) {} - virtual void actions() {} + void actions() override {} }; class Scene300s : public Scene3xx { public: Scene300s(MADSEngine *vm) : Scene3xx(vm) {} - virtual void preActions(); + void preActions() override; }; class Scene301 : public Scene3xx { public: Scene301(MADSEngine *vm) : Scene3xx(vm) {} - virtual void setup(); - virtual void enter(); - virtual void step(); + void setup() override; + void enter() override; + void step() override; }; class Scene302 : public Scene3xx { @@ -103,20 +103,20 @@ private: public: Scene302(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); + void setup() override; + void enter() override; + void step() override; }; class Scene303 : public Scene3xx { public: Scene303(MADSEngine *vm) : Scene3xx(vm) {} - virtual void setup(); - virtual void enter(); - virtual void step(); + void setup() override; + void enter() override; + void step() override; }; class Scene304 : public Scene3xx { @@ -125,11 +125,11 @@ private: public: Scene304(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); + void setup() override; + void enter() override; + void step() override; }; class Scene307 : public Scene3xx { @@ -162,12 +162,12 @@ private: public: Scene307(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void actions() override; }; class Scene308 : public Scene3xx { @@ -176,11 +176,11 @@ private: public: Scene308(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); + void setup() override; + void enter() override; + void step() override; }; class Scene309 : public Scene3xx { @@ -192,11 +192,11 @@ private: public: Scene309(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); + void setup() override; + void enter() override; + void step() override; }; class Scene310 : public Scene3xx { @@ -205,11 +205,11 @@ private: public: Scene310(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); + void setup() override; + void enter() override; + void step() override; }; class Scene311 : public Scene3xx { @@ -218,21 +218,21 @@ private: public: Scene311(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void actions() override; }; class Scene313 : public Scene3xx { public: Scene313(MADSEngine *vm) : Scene3xx(vm) {} - virtual void setup(); - virtual void enter(); - virtual void actions(); + void setup() override; + void enter() override; + void actions() override; }; class Scene316 : public Scene3xx { @@ -243,11 +243,11 @@ private: public: Scene316(MADSEngine *vm) : Scene3xx(vm) {} - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene318 : public Scene3xx { @@ -277,13 +277,13 @@ private: public: Scene318(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene319 : public Scene3xx { @@ -306,12 +306,12 @@ private: void handleSlacheDialogs(int quoteId, int counter, uint32 timer); public: Scene319(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void actions() override; }; class Scene320 : public Scene300s { @@ -331,41 +331,41 @@ private: public: Scene320(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void actions() override; }; class Scene321 : public Scene3xx { public: Scene321(MADSEngine *vm) : Scene3xx(vm) {} - virtual void setup(); - virtual void enter(); - virtual void step(); + void setup() override; + void enter() override; + void step() override; }; class Scene322 : public SceneTeleporter { public: Scene322(MADSEngine *vm) : SceneTeleporter(vm) {} - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void actions() override; }; class Scene351 : public Scene3xx { public: Scene351(MADSEngine *vm) : Scene3xx(vm) {} - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void actions() override; }; class Scene352 : public Scene3xx { @@ -385,51 +385,51 @@ private: public: Scene352(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void preActions() override; + void actions() override; }; class Scene353 : public Scene3xx { public: Scene353(MADSEngine *vm) : Scene3xx(vm) {} - virtual void setup(); - virtual void enter(); - virtual void actions(); + void setup() override; + void enter() override; + void actions() override; }; class Scene354 : public Scene3xx { public: Scene354(MADSEngine *vm) : Scene3xx(vm) {} - virtual void setup(); - virtual void enter(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void preActions() override; + void actions() override; }; class Scene357 : public Scene3xx { public: Scene357(MADSEngine *vm) : Scene3xx(vm) {} - virtual void setup(); - virtual void enter(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void preActions() override; + void actions() override; }; class Scene358 : public Scene3xx { public: Scene358(MADSEngine *vm) : Scene3xx(vm) {} - virtual void setup(); - virtual void enter(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void preActions() override; + void actions() override; }; class Scene359 : public Scene3xx { @@ -438,22 +438,22 @@ private: public: Scene359(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void preActions() override; + void actions() override; }; class Scene360 : public Scene3xx { public: Scene360(MADSEngine *vm) : Scene3xx(vm) {} - virtual void setup(); - virtual void enter(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void preActions() override; + void actions() override; }; class Scene361 : public Scene3xx { @@ -464,38 +464,38 @@ private: public: Scene361(MADSEngine *vm) : Scene3xx(vm) {} - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene366 : public Scene300s { public: Scene366(MADSEngine *vm) : Scene300s(vm) {} - virtual void setup(); - virtual void enter(); - virtual void actions(); + void setup() override; + void enter() override; + void actions() override; }; class Scene387 : public Scene300s { public: Scene387(MADSEngine *vm) : Scene300s(vm) {} - virtual void setup(); - virtual void enter(); - virtual void actions(); + void setup() override; + void enter() override; + void actions() override; }; class Scene388 : public Scene300s { public: Scene388(MADSEngine *vm) : Scene300s(vm) {} - virtual void setup(); - virtual void enter(); - virtual void actions(); + void setup() override; + void enter() override; + void actions() override; }; class Scene389 : public Scene300s { @@ -506,39 +506,39 @@ private: public: Scene389(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void actions() override; }; class Scene390 : public Scene300s { public: Scene390(MADSEngine *vm) : Scene300s(vm) {} - virtual void setup(); - virtual void enter(); - virtual void actions(); + void setup() override; + void enter() override; + void actions() override; }; class Scene391 : public Scene300s { public: Scene391(MADSEngine *vm) : Scene300s(vm) {} - virtual void setup(); - virtual void enter(); - virtual void actions(); + void setup() override; + void enter() override; + void actions() override; }; class Scene399 : public Scene300s { public: Scene399(MADSEngine *vm) : Scene300s(vm) {} - virtual void setup(); - virtual void enter(); - virtual void actions(); + void setup() override; + void enter() override; + void actions() override; }; } // End of namespace Nebular diff --git a/engines/mads/nebular/nebular_scenes4.h b/engines/mads/nebular/nebular_scenes4.h index de11bd41299..160cd7c9a19 100644 --- a/engines/mads/nebular/nebular_scenes4.h +++ b/engines/mads/nebular/nebular_scenes4.h @@ -58,13 +58,13 @@ private: public: Scene401(MADSEngine *vm); - void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene402 : public Scene4xx { @@ -119,24 +119,24 @@ private: public: Scene402(MADSEngine *vm); - void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene405 : public Scene4xx { public: Scene405(MADSEngine *vm) : Scene4xx(vm) {} - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene406 : public Scene4xx { @@ -145,13 +145,13 @@ private: public: Scene406(MADSEngine *vm); - void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene407 : public Scene4xx { @@ -161,44 +161,44 @@ private: public: Scene407(MADSEngine *vm); - void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene408 : public Scene4xx { public: Scene408(MADSEngine *vm) : Scene4xx(vm) {} - virtual void setup(); - virtual void enter(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void preActions() override; + void actions() override; }; class Scene409 : public SceneTeleporter { public: Scene409(MADSEngine *vm) : SceneTeleporter(vm) {} - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void actions() override; }; class Scene410 : public Scene4xx { public: Scene410(MADSEngine *vm) : Scene4xx(vm) {} - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene411 : public Scene4xx { @@ -228,13 +228,13 @@ private: public: Scene411(MADSEngine *vm); - void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene413 : public Scene4xx { @@ -244,13 +244,13 @@ private: public: Scene413(MADSEngine *vm); - void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; } // End of namespace Nebular } // End of namespace MADS diff --git a/engines/mads/nebular/nebular_scenes5.h b/engines/mads/nebular/nebular_scenes5.h index f314ae85131..814307b23b3 100644 --- a/engines/mads/nebular/nebular_scenes5.h +++ b/engines/mads/nebular/nebular_scenes5.h @@ -61,23 +61,23 @@ private: public: Scene501(MADSEngine *vm); - void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene502 : public SceneTeleporter { public: Scene502(MADSEngine *vm) : SceneTeleporter(vm) {} - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void actions() override; }; class Scene503 : public Scene5xx{ @@ -86,11 +86,11 @@ private: public: Scene503(MADSEngine *vm); - void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void actions(); + void setup() override; + void enter() override; + void actions() override; }; class Scene504 : public Scene5xx{ @@ -100,13 +100,13 @@ private: public: Scene504(MADSEngine *vm); - void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene505 : public Scene5xx{ @@ -121,12 +121,12 @@ private: public: Scene505(MADSEngine *vm); - void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void actions() override; }; class Scene506 : public Scene5xx{ @@ -147,12 +147,12 @@ private: public: Scene506(MADSEngine *vm); - void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void actions() override; }; class Scene507 : public Scene5xx{ @@ -161,11 +161,11 @@ private: public: Scene507(MADSEngine *vm); - void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void actions(); + void setup() override; + void enter() override; + void actions() override; }; class Scene508 : public Scene5xx{ @@ -176,12 +176,12 @@ private: public: Scene508(MADSEngine *vm); - void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void preActions() override; + void actions() override; }; class Scene511 : public Scene5xx{ @@ -195,13 +195,13 @@ private: public: Scene511(MADSEngine *vm); - void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene512 : public Scene5xx{ @@ -211,42 +211,42 @@ private: public: Scene512(MADSEngine *vm); - void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void actions(); + void setup() override; + void enter() override; + void actions() override; }; class Scene513 : public Scene5xx{ public: Scene513(MADSEngine *vm) : Scene5xx(vm) {} - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void actions() override; }; class Scene515 : public Scene5xx{ public: Scene515(MADSEngine *vm) : Scene5xx(vm) {} - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void actions() {}; + void setup() override; + void enter() override; + void step() override; + void actions() override {}; }; class Scene551 : public Scene5xx{ public: Scene551(MADSEngine *vm) : Scene5xx(vm) {} - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; } // End of namespace Nebular } // End of namespace MADS diff --git a/engines/mads/nebular/nebular_scenes6.h b/engines/mads/nebular/nebular_scenes6.h index 4fc4a2e8aef..ba41d507a66 100644 --- a/engines/mads/nebular/nebular_scenes6.h +++ b/engines/mads/nebular/nebular_scenes6.h @@ -54,10 +54,10 @@ class Scene601 : public Scene6xx{ public: Scene601(MADSEngine *vm) : Scene6xx(vm) {} - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void actions() override; }; class Scene602 : public Scene6xx{ @@ -71,11 +71,11 @@ private: public: Scene602(MADSEngine *vm); - void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void actions(); + void setup() override; + void enter() override; + void actions() override; }; class Scene603 : public Scene6xx{ @@ -85,11 +85,11 @@ private: public: Scene603(MADSEngine *vm); - void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void actions(); + void setup() override; + void enter() override; + void actions() override; }; class Scene604 : public Scene6xx{ @@ -107,22 +107,22 @@ private: public: Scene604(MADSEngine *vm); - void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void actions() override; }; class Scene605 : public Scene6xx{ public: Scene605(MADSEngine *vm) : Scene6xx(vm) {} - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void actions() override; }; class Scene607 : public Scene6xx{ @@ -143,13 +143,13 @@ private: public: Scene607(MADSEngine *vm); - void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene608 : public Scene6xx{ @@ -191,13 +191,13 @@ private: public: Scene608(MADSEngine *vm); - void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene609 : public Scene6xx{ @@ -208,13 +208,13 @@ private: public: Scene609(MADSEngine *vm); - void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene610 : public Scene6xx{ @@ -229,12 +229,12 @@ private: public: Scene610(MADSEngine *vm); - void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void actions() override; }; class Scene611 : public Scene6xx{ @@ -281,13 +281,13 @@ private: public: Scene611(MADSEngine *vm); - void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene612 : public Scene6xx{ @@ -299,22 +299,22 @@ private: public: Scene612(MADSEngine *vm); - void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void actions() override; }; class Scene620 : public Scene6xx{ public: Scene620(MADSEngine *vm) : Scene6xx(vm) {} - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void actions() {}; + void setup() override; + void enter() override; + void step() override; + void actions() override {}; }; } // End of namespace Nebular } // End of namespace MADS diff --git a/engines/mads/nebular/nebular_scenes7.h b/engines/mads/nebular/nebular_scenes7.h index b5aeba818ca..2bbc9debd0c 100644 --- a/engines/mads/nebular/nebular_scenes7.h +++ b/engines/mads/nebular/nebular_scenes7.h @@ -56,23 +56,23 @@ private: public: Scene701(MADSEngine *vm); - void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void preActions(); - virtual void actions(); - virtual void step(); + void setup() override; + void enter() override; + void preActions() override; + void actions() override; + void step() override; }; class Scene702 : public Scene7xx { public: Scene702(MADSEngine *vm) : Scene7xx(vm) {} - virtual void setup(); - virtual void enter(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void preActions() override; + void actions() override; }; class Scene703 : public Scene7xx{ @@ -98,12 +98,12 @@ private: public: Scene703(MADSEngine *vm); - void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void actions() override; }; class Scene704 : public Scene7xx{ @@ -123,12 +123,12 @@ private: public: Scene704(MADSEngine *vm); - void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void actions() override; }; class Scene705 : public Scene7xx{ @@ -141,12 +141,12 @@ private: public: Scene705(MADSEngine *vm) : Scene7xx(vm) {} - void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void actions() override; }; class Scene706 : public Scene7xx{ @@ -163,43 +163,43 @@ private: public: Scene706(MADSEngine *vm); - void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene707 : public SceneTeleporter { public: Scene707(MADSEngine *vm) : SceneTeleporter(vm) {} - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void actions() override; }; class Scene710 : public Scene7xx { public: Scene710(MADSEngine *vm) : Scene7xx(vm) {} - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void actions() override; }; class Scene711 : public SceneTeleporter { public: Scene711(MADSEngine *vm) : SceneTeleporter(vm) {} - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void actions() override; }; class Scene751 : public Scene7xx{ @@ -208,13 +208,13 @@ private: public: Scene751(MADSEngine *vm); - void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene752 : public Scene7xx { @@ -223,13 +223,13 @@ private: public: Scene752(MADSEngine *vm); - void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; } // End of namespace Nebular diff --git a/engines/mads/nebular/nebular_scenes8.h b/engines/mads/nebular/nebular_scenes8.h index 439815f05c0..25aa358e61b 100644 --- a/engines/mads/nebular/nebular_scenes8.h +++ b/engines/mads/nebular/nebular_scenes8.h @@ -58,35 +58,35 @@ private: public: Scene801(MADSEngine *vm); - void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene802 : public Scene8xx{ public: Scene802(MADSEngine *vm) : Scene8xx(vm) {} - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene803 : public Scene8xx{ public: Scene803(MADSEngine *vm) : Scene8xx(vm) {} - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene804 : public Scene8xx { @@ -103,33 +103,33 @@ private: public: Scene804(MADSEngine *vm); - void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void actions() override; }; class Scene805 : public Scene8xx{ public: Scene805(MADSEngine *vm) : Scene8xx(vm) {} - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene807 : public SceneTeleporter { public: Scene807(MADSEngine *vm) : SceneTeleporter(vm) {} - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void actions() override; }; class Scene808 : public Scene8xx{ @@ -138,11 +138,11 @@ private: public: Scene808(MADSEngine *vm); - void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void actions(); + void setup() override; + void enter() override; + void actions() override; }; class Scene810 : public Scene8xx{ @@ -151,12 +151,12 @@ private: public: Scene810(MADSEngine *vm); - void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void actions() {}; + void setup() override; + void enter() override; + void step() override; + void actions() override {}; }; } // End of namespace Nebular diff --git a/engines/mads/nebular/sound_nebular.h b/engines/mads/nebular/sound_nebular.h index a9e1493109b..2688cbb3b5e 100644 --- a/engines/mads/nebular/sound_nebular.h +++ b/engines/mads/nebular/sound_nebular.h @@ -421,7 +421,7 @@ private: public: ASound1(Audio::Mixer *mixer, OPL::OPL *opl); - virtual int command(int commandId, int param); + int command(int commandId, int param) override; }; class ASound2 : public ASound { @@ -431,7 +431,7 @@ private: typedef int (ASound2::*CommandPtr)(); static const CommandPtr _commandList[44]; - virtual int command0(); + int command0() override; int command9(); int command10(); int command11(); @@ -473,7 +473,7 @@ private: public: ASound2(Audio::Mixer *mixer, OPL::OPL *opl); - virtual int command(int commandId, int param); + int command(int commandId, int param) override; }; class ASound3 : public ASound { @@ -533,7 +533,7 @@ private: public: ASound3(Audio::Mixer *mixer, OPL::OPL *opl); - virtual int command(int commandId, int param); + int command(int commandId, int param) override; }; class ASound4 : public ASound { @@ -571,7 +571,7 @@ private: public: ASound4(Audio::Mixer *mixer, OPL::OPL *opl); - virtual int command(int commandId, int param); + int command(int commandId, int param) override; }; class ASound5 : public ASound { @@ -617,7 +617,7 @@ private: public: ASound5(Audio::Mixer *mixer, OPL::OPL *opl); - virtual int command(int commandId, int param); + int command(int commandId, int param) override; }; class ASound6 : public ASound { @@ -646,7 +646,7 @@ private: public: ASound6(Audio::Mixer *mixer, OPL::OPL *opl); - virtual int command(int commandId, int param); + int command(int commandId, int param) override; }; class ASound7 : public ASound { @@ -678,7 +678,7 @@ private: public: ASound7(Audio::Mixer *mixer, OPL::OPL *opl); - virtual int command(int commandId, int param); + int command(int commandId, int param) override; }; class ASound8 : public ASound { @@ -721,7 +721,7 @@ private: public: ASound8(Audio::Mixer *mixer, OPL::OPL *opl); - virtual int command(int commandId, int param); + int command(int commandId, int param) override; }; class ASound9 : public ASound { @@ -780,7 +780,7 @@ private: public: ASound9(Audio::Mixer *mixer, OPL::OPL *opl); - virtual int command(int commandId, int param); + int command(int commandId, int param) override; }; } // End of namespace Nebular diff --git a/engines/mads/phantom/game_phantom.h b/engines/mads/phantom/game_phantom.h index 2f0204f3311..b3c446f11cb 100644 --- a/engines/mads/phantom/game_phantom.h +++ b/engines/mads/phantom/game_phantom.h @@ -102,27 +102,27 @@ private: protected: GamePhantom(MADSEngine *vm); - virtual void startGame(); + void startGame() override; - virtual void initializeGlobals(); + void initializeGlobals() override; - virtual void setSectionHandler(); + void setSectionHandler() override; - virtual void checkShowDialog(); + void checkShowDialog() override; public: PhantomGlobals _globals; Difficulty _difficulty; - virtual Globals &globals() { return _globals; } + Globals &globals() override { return _globals; } - virtual void doObjectAction(); + void doObjectAction() override; - virtual void unhandledAction(); + void unhandledAction() override; - virtual void step(); + void step() override; - virtual void synchronize(Common::Serializer &s, bool phase1); + void synchronize(Common::Serializer &s, bool phase1) override; void setupCatacombs(); void enterCatacombs(bool val); @@ -137,9 +137,9 @@ class Section1Handler : public SectionHandler { public: Section1Handler(MADSEngine *vm) : SectionHandler(vm) {} - virtual void preLoadSection() {} - virtual void sectionPtr2() {} - virtual void postLoadSection() {} + void preLoadSection() override {} + void sectionPtr2() override {} + void postLoadSection() override {} }; typedef Section1Handler Section2Handler; diff --git a/engines/mads/phantom/phantom_scenes.h b/engines/mads/phantom/phantom_scenes.h index 6b7ab697f3a..8d0555cac1e 100644 --- a/engines/mads/phantom/phantom_scenes.h +++ b/engines/mads/phantom/phantom_scenes.h @@ -474,9 +474,9 @@ public: class SceneInfoPhantom : public SceneInfo { friend class SceneInfo; protected: - virtual void loadCodes(BaseSurface &depthSurface, int variant); + void loadCodes(BaseSurface &depthSurface, int variant) override; - virtual void loadCodes(BaseSurface &depthSurface, Common::SeekableReadStream *stream); + void loadCodes(BaseSurface &depthSurface, Common::SeekableReadStream *stream) override; /** * Constructor diff --git a/engines/mads/phantom/phantom_scenes1.h b/engines/mads/phantom/phantom_scenes1.h index d2c679d4ede..d8f24d49b75 100644 --- a/engines/mads/phantom/phantom_scenes1.h +++ b/engines/mads/phantom/phantom_scenes1.h @@ -71,13 +71,13 @@ private: bool _startSittingFl; public: Scene101(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; void handleConversation0(); void handleConversation1(); @@ -91,13 +91,13 @@ private: public: Scene102(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene103 : public Scene1xx { @@ -141,13 +141,13 @@ private: public: Scene103(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene104 : public Scene1xx { @@ -183,25 +183,25 @@ private: public: Scene104(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene105 : public Scene1xx { public: Scene105(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene106 : public Scene1xx { @@ -209,25 +209,25 @@ private: int _sandbagHostpotId; public: Scene106(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene107 : public Scene1xx { public: Scene107(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene108 : public Scene1xx { @@ -248,13 +248,13 @@ private: public: Scene108(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene109 : public Scene1xx { @@ -267,25 +267,25 @@ private: public: Scene109(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene110 : public Scene1xx { public: Scene110(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene111 : public Scene1xx { @@ -302,13 +302,13 @@ private: public: Scene111(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene112 : public Scene1xx { @@ -330,13 +330,13 @@ private: public: Scene112(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene113 : public Scene1xx { @@ -383,37 +383,37 @@ private: public: Scene113(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene114 : public Scene1xx { public: Scene114(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene150 : public Scene1xx { public: Scene150(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; } // End of namespace Phantom } // End of namespace MADS diff --git a/engines/mads/phantom/phantom_scenes2.h b/engines/mads/phantom/phantom_scenes2.h index d0b83b6c7af..8d05dfaf4e3 100644 --- a/engines/mads/phantom/phantom_scenes2.h +++ b/engines/mads/phantom/phantom_scenes2.h @@ -70,13 +70,13 @@ private: public: Scene201(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene202 : public Scene2xx { @@ -102,13 +102,13 @@ private: public: Scene202(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene203 : public Scene2xx { @@ -141,13 +141,13 @@ private: public: Scene203(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene204 : public Scene2xx { @@ -179,13 +179,13 @@ private: public: Scene204(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene205 : public Scene2xx { @@ -212,13 +212,13 @@ private: public: Scene205(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene206 : public Scene2xx { @@ -229,13 +229,13 @@ private: public: Scene206(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene207 : public Scene2xx { @@ -245,13 +245,13 @@ private: public: Scene207(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene208 : public Scene2xx { @@ -280,25 +280,25 @@ private: public: Scene208(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene250 : public Scene2xx { public: Scene250(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; } // End of namespace Phantom diff --git a/engines/mads/phantom/phantom_scenes3.h b/engines/mads/phantom/phantom_scenes3.h index 87b7681a79d..1b573d0daa8 100644 --- a/engines/mads/phantom/phantom_scenes3.h +++ b/engines/mads/phantom/phantom_scenes3.h @@ -64,25 +64,25 @@ private: public: Scene301(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene302 : public Scene3xx { public: Scene302(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene303 : public Scene3xx { @@ -92,13 +92,13 @@ private: int _skipFrameCheckFl; public: Scene303(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene304 : public Scene3xx { @@ -122,13 +122,13 @@ private: public: Scene304(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene305 : public Scene3xx { @@ -144,13 +144,13 @@ private: public: Scene305(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene306 : public Scene3xx { @@ -159,25 +159,25 @@ private: public: Scene306(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene307 : public Scene3xx { public: Scene307(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene308 : public Scene3xx { @@ -192,13 +192,13 @@ private: public: Scene308(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene309 : public Scene3xx { @@ -213,13 +213,13 @@ private: public: Scene309(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene310 : public Scene3xx { @@ -234,13 +234,13 @@ private: public: Scene310(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; } // End of namespace Phantom } // End of namespace MADS diff --git a/engines/mads/phantom/phantom_scenes4.h b/engines/mads/phantom/phantom_scenes4.h index bea14116003..665d791ad3a 100644 --- a/engines/mads/phantom/phantom_scenes4.h +++ b/engines/mads/phantom/phantom_scenes4.h @@ -66,13 +66,13 @@ private: public: Scene401(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene403 : public Scene4xx { @@ -87,13 +87,13 @@ private: public: Scene403(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene404 : public Scene4xx { @@ -109,13 +109,13 @@ private: public: Scene404(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene406 : public Scene4xx { @@ -130,13 +130,13 @@ private: public: Scene406(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene407 : public Scene4xx { @@ -151,13 +151,13 @@ private: public: Scene407(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene408 : public Scene4xx { @@ -172,13 +172,13 @@ private: public: Scene408(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene409 : public Scene4xx { @@ -193,13 +193,13 @@ private: public: Scene409(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene410 : public Scene4xx { @@ -209,13 +209,13 @@ private: public: Scene410(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene453 : public Scene4xx { @@ -230,13 +230,13 @@ private: public: Scene453(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene456 : public Scene4xx { @@ -251,13 +251,13 @@ private: public: Scene456(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; } // End of namespace Phantom } // End of namespace MADS diff --git a/engines/mads/phantom/phantom_scenes5.h b/engines/mads/phantom/phantom_scenes5.h index 048e9b9aab4..b4023f738a2 100644 --- a/engines/mads/phantom/phantom_scenes5.h +++ b/engines/mads/phantom/phantom_scenes5.h @@ -60,13 +60,13 @@ private: public: Scene501(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene502 : public Scene5xx { @@ -103,15 +103,15 @@ private: public: Scene502(MADSEngine *vm); - ~Scene502(); + ~Scene502() override; - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene504 : public Scene5xx { @@ -152,13 +152,13 @@ private: public: Scene504(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene505 : public Scene5xx { @@ -187,13 +187,13 @@ private: public: Scene505(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; class Scene506 : public Scene5xx { @@ -204,13 +204,13 @@ private: public: Scene506(MADSEngine *vm); - virtual void synchronize(Common::Serializer &s); + void synchronize(Common::Serializer &s) override; - virtual void setup(); - virtual void enter(); - virtual void step(); - virtual void preActions(); - virtual void actions(); + void setup() override; + void enter() override; + void step() override; + void preActions() override; + void actions() override; }; } // End of namespace Phantom diff --git a/engines/mads/resources.cpp b/engines/mads/resources.cpp index 16019a4b078..01ad4a9b91c 100644 --- a/engines/mads/resources.cpp +++ b/engines/mads/resources.cpp @@ -80,13 +80,13 @@ private: ResourceType getResourceType(const Common::String &resourceName) const; public: explicit HagArchive(MADSEngine *vm); - virtual ~HagArchive(); + ~HagArchive() override; // Archive implementation - virtual bool hasFile(const Common::String &name) const; - virtual int listMembers(Common::ArchiveMemberList &list) const; - virtual const Common::ArchiveMemberPtr getMember(const Common::String &name) const; - virtual Common::SeekableReadStream *createReadStreamForMember(const Common::String &name) const; + bool hasFile(const Common::String &name) const override; + int listMembers(Common::ArchiveMemberList &list) const override; + const Common::ArchiveMemberPtr getMember(const Common::String &name) const override; + Common::SeekableReadStream *createReadStreamForMember(const Common::String &name) const override; }; const char *const MADSCONCAT_STRING = "MADSCONCAT"; diff --git a/engines/mads/screen.h b/engines/mads/screen.h index 92cd5bc0a2c..592e3314ce0 100644 --- a/engines/mads/screen.h +++ b/engines/mads/screen.h @@ -229,12 +229,12 @@ public: /** * Destructor */ - virtual ~Screen() {} + ~Screen() override {} /** * Updates the physical screen with contents of the internal surface */ - virtual void update(); + void update() override; /** * Transition to a new screen with a given effect diff --git a/engines/mads/sprites.h b/engines/mads/sprites.h index 3db922c40b0..a1e28c51fab 100644 --- a/engines/mads/sprites.h +++ b/engines/mads/sprites.h @@ -114,7 +114,7 @@ public: MSprite(); MSprite(Common::SeekableReadStream *source, const Common::Array &palette, const Common::Rect &bounds); - virtual ~MSprite(); + ~MSprite() override; Common::Point _offset; int _transparencyIndex; diff --git a/engines/mads/user_interface.h b/engines/mads/user_interface.h index 6c9485998ad..00f03c53bad 100644 --- a/engines/mads/user_interface.h +++ b/engines/mads/user_interface.h @@ -221,7 +221,7 @@ public: /** * Loads an interface from a specified resource */ - virtual void load(const Common::String &resName); + void load(const Common::String &resName) override; /** * Set up the interface