From a08dc0b9dc704fb136c4df12b6082965c7126319 Mon Sep 17 00:00:00 2001 From: Bastien Bouclet Date: Sun, 9 Feb 2020 12:05:30 +0100 Subject: [PATCH] MUTATIONOFJB: Add override keywords --- .../mutationofjb/commands/additemcommand.h | 6 ++--- .../commands/bitmapvisibilitycommand.h | 6 ++--- .../mutationofjb/commands/callmacrocommand.h | 8 +++---- .../mutationofjb/commands/camefromcommand.h | 6 ++--- engines/mutationofjb/commands/changecommand.h | 24 +++++++++---------- .../commands/conditionalcommand.h | 6 ++--- .../commands/definestructcommand.h | 6 ++--- .../mutationofjb/commands/endblockcommand.h | 12 +++++----- engines/mutationofjb/commands/gotocommand.h | 8 +++---- engines/mutationofjb/commands/ifcommand.h | 6 ++--- engines/mutationofjb/commands/ifitemcommand.h | 6 ++--- .../mutationofjb/commands/ifpiggycommand.h | 6 ++--- engines/mutationofjb/commands/labelcommand.h | 6 ++--- .../mutationofjb/commands/loadplayercommand.h | 6 ++--- .../mutationofjb/commands/newroomcommand.h | 6 ++--- .../commands/playanimationcommand.h | 6 ++--- engines/mutationofjb/commands/randomcommand.h | 12 +++++----- .../commands/removeallitemscommand.h | 6 ++--- .../mutationofjb/commands/removeitemcommand.h | 6 ++--- engines/mutationofjb/commands/renamecommand.h | 6 ++--- engines/mutationofjb/commands/saycommand.h | 6 ++--- engines/mutationofjb/commands/seqcommand.h | 4 ++-- .../mutationofjb/commands/setcolorcommand.h | 6 ++--- .../commands/setobjectframecommand.h | 6 ++--- .../commands/specialshowcommand.h | 6 ++--- .../mutationofjb/commands/switchpartcommand.h | 6 ++--- engines/mutationofjb/commands/talkcommand.h | 6 ++--- engines/mutationofjb/debug.h | 2 +- engines/mutationofjb/detection.cpp | 12 +++++----- engines/mutationofjb/encryptedfile.h | 2 +- engines/mutationofjb/font.h | 12 +++++----- engines/mutationofjb/gamedata.h | 12 +++++----- engines/mutationofjb/gamescreen.cpp | 8 +++---- engines/mutationofjb/gamescreen.h | 18 +++++++------- engines/mutationofjb/inventory.h | 2 +- engines/mutationofjb/mutationofjb.h | 14 +++++------ engines/mutationofjb/room.cpp | 4 ++-- engines/mutationofjb/tasks/conversationtask.h | 8 +++---- .../mutationofjb/tasks/objectanimationtask.h | 4 ++-- engines/mutationofjb/tasks/saytask.h | 6 ++--- engines/mutationofjb/tasks/sequentialtask.h | 4 ++-- engines/mutationofjb/widgets/buttonwidget.h | 4 ++-- .../mutationofjb/widgets/conversationwidget.h | 4 ++-- engines/mutationofjb/widgets/gamewidget.h | 4 ++-- engines/mutationofjb/widgets/imagewidget.h | 2 +- .../mutationofjb/widgets/inventorywidget.h | 4 ++-- engines/mutationofjb/widgets/labelwidget.h | 2 +- 47 files changed, 161 insertions(+), 161 deletions(-) diff --git a/engines/mutationofjb/commands/additemcommand.h b/engines/mutationofjb/commands/additemcommand.h index d740d35c050..a88395b8b95 100644 --- a/engines/mutationofjb/commands/additemcommand.h +++ b/engines/mutationofjb/commands/additemcommand.h @@ -32,15 +32,15 @@ class AddItemCommandParser : public SeqCommandParser { public: AddItemCommandParser() {} - virtual bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; + bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; }; class AddItemCommand : public SeqCommand { public: AddItemCommand(const Common::String &item) : _item(item) {} - virtual ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; - virtual Common::String debugString() const override; + ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; + Common::String debugString() const override; private: Common::String _item; }; diff --git a/engines/mutationofjb/commands/bitmapvisibilitycommand.h b/engines/mutationofjb/commands/bitmapvisibilitycommand.h index 366abd3148f..e203195c456 100644 --- a/engines/mutationofjb/commands/bitmapvisibilitycommand.h +++ b/engines/mutationofjb/commands/bitmapvisibilitycommand.h @@ -32,7 +32,7 @@ class BitmapVisibilityCommandParser : public SeqCommandParser { public: BitmapVisibilityCommandParser() {} - virtual bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command); + bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; }; class BitmapVisibilityCommand : public SeqCommand { @@ -40,8 +40,8 @@ public: BitmapVisibilityCommand(uint8 sceneId, uint8 bitmapId, bool visible) : _sceneId(sceneId), _bitmapId(bitmapId), _visible(visible) {} const Common::String &getName() const; - virtual ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; - virtual Common::String debugString() const override; + ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; + Common::String debugString() const override; private: uint8 _sceneId; uint8 _bitmapId; diff --git a/engines/mutationofjb/commands/callmacrocommand.h b/engines/mutationofjb/commands/callmacrocommand.h index 0486bcd4d55..a210df27d15 100644 --- a/engines/mutationofjb/commands/callmacrocommand.h +++ b/engines/mutationofjb/commands/callmacrocommand.h @@ -33,8 +33,8 @@ class CallMacroCommandParser : public CommandParser { public: CallMacroCommandParser() {} - virtual bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; - virtual void transition(ScriptParseContext &parseCtx, Command *oldCommand, Command *newCommand, CommandParser *newCommandParser) override; + bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; + void transition(ScriptParseContext &parseCtx, Command *oldCommand, Command *newCommand, CommandParser *newCommandParser) override; }; class CallMacroCommand : public Command { @@ -44,9 +44,9 @@ public: Command *getReturnCommand() const; - virtual ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; + ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; Command *next() const override; - virtual Common::String debugString() const override; + Common::String debugString() const override; private: Common::String _macroName; Command *_returnCommand; diff --git a/engines/mutationofjb/commands/camefromcommand.h b/engines/mutationofjb/commands/camefromcommand.h index c2e971deb2f..6dfc5e31d62 100644 --- a/engines/mutationofjb/commands/camefromcommand.h +++ b/engines/mutationofjb/commands/camefromcommand.h @@ -31,14 +31,14 @@ namespace MutationOfJB { class CameFromCommandParser : public ConditionalCommandParser { public: CameFromCommandParser() : ConditionalCommandParser(true) {} - virtual bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command); + bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; }; class CameFromCommand : public ConditionalCommand { public: CameFromCommand(uint8 sceneId) : _sceneId(sceneId) {} - virtual ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; - virtual Common::String debugString() const override; + ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; + Common::String debugString() const override; private: uint8 _sceneId; }; diff --git a/engines/mutationofjb/commands/changecommand.h b/engines/mutationofjb/commands/changecommand.h index cb3a9b7ba84..935631478ff 100644 --- a/engines/mutationofjb/commands/changecommand.h +++ b/engines/mutationofjb/commands/changecommand.h @@ -90,22 +90,22 @@ protected: class ChangeObjectCommandParser : public ChangeCommandParser { public: - virtual bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; + bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; }; class ChangeDoorCommandParser : public ChangeCommandParser { public: - virtual bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; + bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; }; class ChangeStaticCommandParser : public ChangeCommandParser { public: - virtual bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; + bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; }; class ChangeSceneCommandParser : public ChangeCommandParser { public: - virtual bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; + bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; }; class ChangeDoorCommand : public ChangeCommand { @@ -113,8 +113,8 @@ public: ChangeDoorCommand(uint8 sceneId, uint8 doorId, ChangeRegister reg, ChangeOperation op, const ChangeCommandValue &val) : ChangeCommand(sceneId, doorId, reg, op, val) {} - virtual ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; - virtual Common::String debugString() const override; + ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; + Common::String debugString() const override; }; class ChangeObjectCommand : public ChangeCommand { @@ -122,8 +122,8 @@ public: ChangeObjectCommand(uint8 sceneId, uint8 objectId, ChangeRegister reg, ChangeOperation op, const ChangeCommandValue &val) : ChangeCommand(sceneId, objectId, reg, op, val) {} - virtual ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; - virtual Common::String debugString() const override; + ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; + Common::String debugString() const override; }; class ChangeStaticCommand : public ChangeCommand { @@ -131,8 +131,8 @@ public: ChangeStaticCommand(uint8 sceneId, uint8 staticId, ChangeRegister reg, ChangeOperation op, const ChangeCommandValue &val) : ChangeCommand(sceneId, staticId, reg, op, val) {} - virtual ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; - virtual Common::String debugString() const override; + ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; + Common::String debugString() const override; }; class ChangeSceneCommand : public ChangeCommand { @@ -140,8 +140,8 @@ public: ChangeSceneCommand(uint8 sceneId, uint8 staticId, ChangeRegister reg, ChangeOperation op, const ChangeCommandValue &val) : ChangeCommand(sceneId, staticId, reg, op, val) {} - virtual ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; - virtual Common::String debugString() const override; + ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; + Common::String debugString() const override; }; } diff --git a/engines/mutationofjb/commands/conditionalcommand.h b/engines/mutationofjb/commands/conditionalcommand.h index dff33da144d..fef76392c72 100644 --- a/engines/mutationofjb/commands/conditionalcommand.h +++ b/engines/mutationofjb/commands/conditionalcommand.h @@ -32,8 +32,8 @@ namespace MutationOfJB { class ConditionalCommandParser : public CommandParser { public: ConditionalCommandParser(bool firstHash = false) : _firstHash(firstHash) {} - virtual void transition(ScriptParseContext &parseCtx, Command *oldCommand, Command *newCommand, CommandParser *newCommandParser) override; - virtual void finish(ScriptParseContext &parseCtx) override; + void transition(ScriptParseContext &parseCtx, Command *oldCommand, Command *newCommand, CommandParser *newCommandParser) override; + void finish(ScriptParseContext &parseCtx) override; protected: Common::Queue _tags; private: @@ -50,7 +50,7 @@ public: void setTrueCommand(Command *command); void setFalseCommand(Command *command); - virtual Command *next() const override; + Command *next() const override; protected: Command *_trueCommand; Command *_falseCommand; diff --git a/engines/mutationofjb/commands/definestructcommand.h b/engines/mutationofjb/commands/definestructcommand.h index 651f9439c7e..de4e1a7a469 100644 --- a/engines/mutationofjb/commands/definestructcommand.h +++ b/engines/mutationofjb/commands/definestructcommand.h @@ -27,14 +27,14 @@ namespace MutationOfJB { class DefineStructCommandParser : public SeqCommandParser { public: - virtual bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; + bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; }; class DefineStructCommand : public SeqCommand { public: DefineStructCommand(const ConversationInfo& convInfo) : _conversationInfo(convInfo) {} - virtual Command::ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; - virtual Common::String debugString() const override; + Command::ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; + Common::String debugString() const override; private: ConversationInfo _conversationInfo; }; diff --git a/engines/mutationofjb/commands/endblockcommand.h b/engines/mutationofjb/commands/endblockcommand.h index b9ac15cffd3..a3a093bcb9e 100644 --- a/engines/mutationofjb/commands/endblockcommand.h +++ b/engines/mutationofjb/commands/endblockcommand.h @@ -35,9 +35,9 @@ class EndBlockCommandParser : public CommandParser { public: EndBlockCommandParser() : _elseFound(false), _hashFound(false), _ifTag(0) {} - virtual bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; - virtual void transition(ScriptParseContext &parseCtx, Command *oldCommand, Command *newCommand, CommandParser *newCommandParser) override; - virtual void finish(ScriptParseContext &parseCtx) override; + bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; + void transition(ScriptParseContext &parseCtx, Command *oldCommand, Command *newCommand, CommandParser *newCommandParser) override; + void finish(ScriptParseContext &parseCtx) override; private: bool _elseFound; bool _hashFound; @@ -64,9 +64,9 @@ public: EndBlockCommand() : _nextCmd(nullptr) {} static bool ParseFunc(const Common::String &line, ScriptParseContext &parseContext, Command *&command); - virtual ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; - virtual Command *next() const override; - virtual Common::String debugString() const override; + ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; + Command *next() const override; + Common::String debugString() const override; private: Command *_nextCmd; }; diff --git a/engines/mutationofjb/commands/gotocommand.h b/engines/mutationofjb/commands/gotocommand.h index b56e6424ddb..f507a63f1a4 100644 --- a/engines/mutationofjb/commands/gotocommand.h +++ b/engines/mutationofjb/commands/gotocommand.h @@ -34,7 +34,7 @@ class GotoCommandParser : public CommandParser { public: GotoCommandParser() {} - virtual bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; + bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; }; class GotoCommand : public Command { @@ -43,9 +43,9 @@ public: void setLabelCommand(LabelCommand *labelCmd); - virtual ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; - virtual Command *next() const override; - virtual Common::String debugString() const override; + ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; + Command *next() const override; + Common::String debugString() const override; private: LabelCommand *_labelCommand; }; diff --git a/engines/mutationofjb/commands/ifcommand.h b/engines/mutationofjb/commands/ifcommand.h index c0d93d795d8..ba2a89e685d 100644 --- a/engines/mutationofjb/commands/ifcommand.h +++ b/engines/mutationofjb/commands/ifcommand.h @@ -32,7 +32,7 @@ class ScriptParseContext; class IfCommandParser : public ConditionalCommandParser { public: - virtual bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command); + bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; private: }; @@ -40,8 +40,8 @@ class IfCommand : public ConditionalCommand { public: IfCommand(uint8 sceneId, uint8 objectId, uint16 value, bool negative); - virtual ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; - virtual Common::String debugString() const override; + ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; + Common::String debugString() const override; private: uint8 _sceneId; diff --git a/engines/mutationofjb/commands/ifitemcommand.h b/engines/mutationofjb/commands/ifitemcommand.h index 77cdf0b1324..ab14f2c2539 100644 --- a/engines/mutationofjb/commands/ifitemcommand.h +++ b/engines/mutationofjb/commands/ifitemcommand.h @@ -33,15 +33,15 @@ class ScriptParseContext; class IfItemCommandParser : public ConditionalCommandParser { public: - virtual bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; + bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; }; class IfItemCommand : public ConditionalCommand { public: IfItemCommand(const Common::String &item, bool negative); - virtual ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; - virtual Common::String debugString() const override; + ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; + Common::String debugString() const override; private: Common::String _item; diff --git a/engines/mutationofjb/commands/ifpiggycommand.h b/engines/mutationofjb/commands/ifpiggycommand.h index d1db4c9c036..05a39d74a52 100644 --- a/engines/mutationofjb/commands/ifpiggycommand.h +++ b/engines/mutationofjb/commands/ifpiggycommand.h @@ -33,13 +33,13 @@ class ScriptParseContext; class IfPiggyCommandParser : public ConditionalCommandParser { public: - virtual bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command); + bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; }; class IfPiggyCommand : public ConditionalCommand { public: - virtual ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; - virtual Common::String debugString() const override; + ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; + Common::String debugString() const override; private: }; diff --git a/engines/mutationofjb/commands/labelcommand.h b/engines/mutationofjb/commands/labelcommand.h index f4acad63e0e..5d979af7fa0 100644 --- a/engines/mutationofjb/commands/labelcommand.h +++ b/engines/mutationofjb/commands/labelcommand.h @@ -32,7 +32,7 @@ class LabelCommandParser : public SeqCommandParser { public: LabelCommandParser() {} - virtual bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command); + bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; }; class LabelCommand : public SeqCommand { @@ -40,8 +40,8 @@ public: LabelCommand(const Common::String &name) : _name(name) {} const Common::String &getName() const; - virtual ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; - virtual Common::String debugString() const override; + ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; + Common::String debugString() const override; private: Common::String _name; }; diff --git a/engines/mutationofjb/commands/loadplayercommand.h b/engines/mutationofjb/commands/loadplayercommand.h index 4616e424741..e551f7e536f 100644 --- a/engines/mutationofjb/commands/loadplayercommand.h +++ b/engines/mutationofjb/commands/loadplayercommand.h @@ -33,14 +33,14 @@ class ConversationTask; class LoadPlayerCommandParser : public SeqCommandParser { public: - virtual bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; + bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; }; class LoadPlayerCommand : public SeqCommand { public: LoadPlayerCommand(uint8 apkFrameFirst, uint8 apkFrameLast, uint8 playerFrameFirst, uint8 palIndexFirst, const Common::String &apkFileName) : _apkFrameFirst(apkFrameFirst), _apkFrameLast(apkFrameLast), _playerFrameFirst(playerFrameFirst), _palIndexFirst(palIndexFirst), _apkFileName(apkFileName) {} - virtual ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; - virtual Common::String debugString() const override; + ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; + Common::String debugString() const override; private: uint8 _apkFrameFirst; diff --git a/engines/mutationofjb/commands/newroomcommand.h b/engines/mutationofjb/commands/newroomcommand.h index f224e442997..83221d6f107 100644 --- a/engines/mutationofjb/commands/newroomcommand.h +++ b/engines/mutationofjb/commands/newroomcommand.h @@ -33,15 +33,15 @@ class NewRoomCommandParser : public SeqCommandParser { public: NewRoomCommandParser() {} - virtual bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; + bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; }; class NewRoomCommand : public SeqCommand { public: NewRoomCommand(uint8 sceneId, uint16 x, uint16 y, uint8 frame); - virtual ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; - virtual Common::String debugString() const override; + ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; + Common::String debugString() const override; private: uint8 _sceneId; uint16 _x; diff --git a/engines/mutationofjb/commands/playanimationcommand.h b/engines/mutationofjb/commands/playanimationcommand.h index 4f0d4d7e69e..f9fca860f71 100644 --- a/engines/mutationofjb/commands/playanimationcommand.h +++ b/engines/mutationofjb/commands/playanimationcommand.h @@ -32,7 +32,7 @@ class PlayAnimationCommandParser : public SeqCommandParser { public: PlayAnimationCommandParser() {} - virtual bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command); + bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; }; class PlayAnimationCommand : public SeqCommand { @@ -40,8 +40,8 @@ public: PlayAnimationCommand(int fromFrame, int toFrame) : _fromFrame(fromFrame), _toFrame(toFrame) {} const Common::String &getName() const; - virtual ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; - virtual Common::String debugString() const override; + ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; + Common::String debugString() const override; private: int _fromFrame; int _toFrame; diff --git a/engines/mutationofjb/commands/randomcommand.h b/engines/mutationofjb/commands/randomcommand.h index ffe9fc2374f..3bb9c01a19e 100644 --- a/engines/mutationofjb/commands/randomcommand.h +++ b/engines/mutationofjb/commands/randomcommand.h @@ -33,15 +33,15 @@ class RandomCommandParser : public CommandParser { public: RandomCommandParser() {} - virtual bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; + bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; }; class RandomBlockStartParser : public CommandParser { public: RandomBlockStartParser() {} - virtual bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; - virtual void transition(ScriptParseContext &parseCtx, Command *oldCommand, Command *newCommand, CommandParser *newCommandParser) override; + bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; + void transition(ScriptParseContext &parseCtx, Command *oldCommand, Command *newCommand, CommandParser *newCommandParser) override; }; class RandomCommand : public Command { @@ -52,10 +52,10 @@ public: RandomCommand(uint numChoices); - virtual ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; - virtual Command *next() const override; + ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; + Command *next() const override; - virtual Common::String debugString() const override; + Common::String debugString() const override; const Choices &getChoices() const; diff --git a/engines/mutationofjb/commands/removeallitemscommand.h b/engines/mutationofjb/commands/removeallitemscommand.h index 92fe93f4cfb..602a63ff0d0 100644 --- a/engines/mutationofjb/commands/removeallitemscommand.h +++ b/engines/mutationofjb/commands/removeallitemscommand.h @@ -31,15 +31,15 @@ class RemoveAllItemsCommandParser : public SeqCommandParser { public: RemoveAllItemsCommandParser() {} - virtual bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command); + bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; }; class RemoveAllItemsCommand : public SeqCommand { public: RemoveAllItemsCommand() {} - virtual ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; - virtual Common::String debugString() const override; + ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; + Common::String debugString() const override; private: }; diff --git a/engines/mutationofjb/commands/removeitemcommand.h b/engines/mutationofjb/commands/removeitemcommand.h index 0aa13f5c845..16073c6f0e2 100644 --- a/engines/mutationofjb/commands/removeitemcommand.h +++ b/engines/mutationofjb/commands/removeitemcommand.h @@ -32,15 +32,15 @@ class RemoveItemCommandParser : public SeqCommandParser { public: RemoveItemCommandParser() {} - virtual bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command); + bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; }; class RemoveItemCommand : public SeqCommand { public: RemoveItemCommand(const Common::String &item) : _item(item) {} - virtual ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; - virtual Common::String debugString() const override; + ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; + Common::String debugString() const override; private: Common::String _item; }; diff --git a/engines/mutationofjb/commands/renamecommand.h b/engines/mutationofjb/commands/renamecommand.h index 566d46eda4a..cf10357ae65 100644 --- a/engines/mutationofjb/commands/renamecommand.h +++ b/engines/mutationofjb/commands/renamecommand.h @@ -30,15 +30,15 @@ namespace MutationOfJB { class RenameCommandParser : public SeqCommandParser { public: - virtual bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; + bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; }; class RenameCommand : public SeqCommand { public: RenameCommand(const Common::String &oldName, const Common::String &newName) : _oldName(oldName), _newName(newName) {} - virtual Command::ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; - virtual Common::String debugString() const override; + Command::ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; + Common::String debugString() const override; private: Common::String _oldName; diff --git a/engines/mutationofjb/commands/saycommand.h b/engines/mutationofjb/commands/saycommand.h index 60c7cc8e0b5..b5df58a20f3 100644 --- a/engines/mutationofjb/commands/saycommand.h +++ b/engines/mutationofjb/commands/saycommand.h @@ -32,7 +32,7 @@ class SayCommandParser : public SeqCommandParser { public: SayCommandParser() {} - virtual bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; + bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; }; class SayCommand : public SeqCommand { @@ -42,8 +42,8 @@ public: _voiceFile(voiceFile), _waitForPrevious(waitForPrevious), _talkingAnimation(talkingAnimation) {} - virtual ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; - virtual Common::String debugString() const override; + ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; + Common::String debugString() const override; private: Common::String _lineToSay; Common::String _voiceFile; diff --git a/engines/mutationofjb/commands/seqcommand.h b/engines/mutationofjb/commands/seqcommand.h index f61f33b66fa..a4573b6f068 100644 --- a/engines/mutationofjb/commands/seqcommand.h +++ b/engines/mutationofjb/commands/seqcommand.h @@ -30,7 +30,7 @@ namespace MutationOfJB { class SeqCommandParser : public CommandParser { public: - virtual void transition(ScriptParseContext &parseCtx, Command *oldCommand, Command *newCommand, CommandParser *newCommandParser) override; + void transition(ScriptParseContext &parseCtx, Command *oldCommand, Command *newCommand, CommandParser *newCommandParser) override; }; /** @@ -40,7 +40,7 @@ class SeqCommand : public Command { public: SeqCommand() : _nextCommand(nullptr) {} void setNextCommand(Command *nextCommand); - virtual Command *next() const override; + Command *next() const override; private: Command *_nextCommand; diff --git a/engines/mutationofjb/commands/setcolorcommand.h b/engines/mutationofjb/commands/setcolorcommand.h index ace36ff3ecf..29f2475e55d 100644 --- a/engines/mutationofjb/commands/setcolorcommand.h +++ b/engines/mutationofjb/commands/setcolorcommand.h @@ -31,7 +31,7 @@ namespace MutationOfJB { class SetColorCommandParser : public SeqCommandParser { public: - virtual bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; + bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; }; @@ -39,8 +39,8 @@ class SetColorCommand : public SeqCommand { public: SetColorCommand(uint8 color) : _color(color) {} - virtual Command::ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; - virtual Common::String debugString() const override; + Command::ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; + Common::String debugString() const override; private: uint8 _color; diff --git a/engines/mutationofjb/commands/setobjectframecommand.h b/engines/mutationofjb/commands/setobjectframecommand.h index b8c091b8478..9d5c0edf6cf 100644 --- a/engines/mutationofjb/commands/setobjectframecommand.h +++ b/engines/mutationofjb/commands/setobjectframecommand.h @@ -32,15 +32,15 @@ class SetObjectFrameCommandParser : public SeqCommandParser { public: SetObjectFrameCommandParser() {} - virtual bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command); + bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; }; class SetObjectFrameCommand : public SeqCommand { public: SetObjectFrameCommand(uint8 objectId, uint8 frame) : _objectId(objectId), _frame(frame) {} - virtual ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; - virtual Common::String debugString() const override; + ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; + Common::String debugString() const override; private: uint8 _objectId; uint8 _frame; diff --git a/engines/mutationofjb/commands/specialshowcommand.h b/engines/mutationofjb/commands/specialshowcommand.h index 402940d3774..fb7d679e77f 100644 --- a/engines/mutationofjb/commands/specialshowcommand.h +++ b/engines/mutationofjb/commands/specialshowcommand.h @@ -30,7 +30,7 @@ namespace MutationOfJB { class SpecialShowCommandParser : public SeqCommandParser { public: - virtual bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; + bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; }; class SpecialShowCommand : public SeqCommand { @@ -41,8 +41,8 @@ public: }; SpecialShowCommand(Mode mode) : _mode(mode) {} - virtual ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; - virtual Common::String debugString() const override; + ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; + Common::String debugString() const override; private: Mode _mode; diff --git a/engines/mutationofjb/commands/switchpartcommand.h b/engines/mutationofjb/commands/switchpartcommand.h index ded49a53a75..674572d5e32 100644 --- a/engines/mutationofjb/commands/switchpartcommand.h +++ b/engines/mutationofjb/commands/switchpartcommand.h @@ -32,14 +32,14 @@ class ConversationTask; class SwitchPartCommandParser : public SeqCommandParser { public: - virtual bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; + bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; }; class SwitchPartCommand : public SeqCommand { public: SwitchPartCommand() {} - virtual ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; - virtual Common::String debugString() const override; + ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; + Common::String debugString() const override; }; } diff --git a/engines/mutationofjb/commands/talkcommand.h b/engines/mutationofjb/commands/talkcommand.h index cf01ddd43b6..2b6e9402f48 100644 --- a/engines/mutationofjb/commands/talkcommand.h +++ b/engines/mutationofjb/commands/talkcommand.h @@ -33,7 +33,7 @@ class ConversationTask; class TalkCommandParser : public SeqCommandParser { public: - virtual bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; + bool parse(const Common::String &line, ScriptParseContext &parseCtx, Command *&command) override; }; class TalkCommand : public SeqCommand { @@ -45,8 +45,8 @@ public: }; TalkCommand(Mode mode) : _mode(mode) {} - virtual ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; - virtual Common::String debugString() const override; + ExecuteResult execute(ScriptExecutionContext &scriptExecCtx) override; + Common::String debugString() const override; private: Mode _mode; diff --git a/engines/mutationofjb/debug.h b/engines/mutationofjb/debug.h index 679cafc8ec4..516f81e0e45 100644 --- a/engines/mutationofjb/debug.h +++ b/engines/mutationofjb/debug.h @@ -34,7 +34,7 @@ class Script; class Console : public GUI::Debugger { public: Console(MutationOfJBEngine *vm); - virtual ~Console(void) {} + ~Console(void) override {} private: bool cmd_showallcommands(int argc, const char **argv); bool cmd_listsections(int argc, const char **argv); diff --git a/engines/mutationofjb/detection.cpp b/engines/mutationofjb/detection.cpp index 1fe21ba299c..cbe50ccc96c 100644 --- a/engines/mutationofjb/detection.cpp +++ b/engines/mutationofjb/detection.cpp @@ -96,22 +96,22 @@ public: return "mutationofjb"; } - virtual const char *getName() const override { + const char *getName() const override { return "Mutation of J.B."; } - virtual const char *getOriginalCopyright() const override { + const char *getOriginalCopyright() const override { return "Mutation of J.B. (C) 1996 RIKI Computer Games"; } - virtual bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override { + bool createInstance(OSystem *syst, Engine **engine, const ADGameDescription *desc) const override { if (desc) { *engine = new MutationOfJB::MutationOfJBEngine(syst, desc); } return desc != nullptr; } - virtual bool hasFeature(MetaEngineFeature f) const override { + bool hasFeature(MetaEngineFeature f) const override { if (f == kSupportsListSaves || f == kSimpleSavesNames || f == kSupportsLoadingDuringStartup) { return true; } @@ -119,11 +119,11 @@ public: return false; } - virtual int getMaximumSaveSlot() const override { + int getMaximumSaveSlot() const override { return 999; } - virtual SaveStateList listSaves(const char *target) const override { + SaveStateList listSaves(const char *target) const override { Common::SaveFileManager *const saveFileMan = g_system->getSavefileManager(); Common::StringArray filenames; Common::String pattern = target; diff --git a/engines/mutationofjb/encryptedfile.h b/engines/mutationofjb/encryptedfile.h index 2053f1feee4..d01059ecbbd 100644 --- a/engines/mutationofjb/encryptedfile.h +++ b/engines/mutationofjb/encryptedfile.h @@ -29,7 +29,7 @@ namespace MutationOfJB { class EncryptedFile : public Common::File { public: - virtual uint32 read(void *dataPtr, uint32 dataSize) override; + uint32 read(void *dataPtr, uint32 dataSize) override; }; } diff --git a/engines/mutationofjb/font.h b/engines/mutationofjb/font.h index 51825dbe139..b86526dd307 100644 --- a/engines/mutationofjb/font.h +++ b/engines/mutationofjb/font.h @@ -40,11 +40,11 @@ class Font : public Graphics::Font { public: Font(const Common::String &fileName, int horizSpacing, int lineHeight); - virtual int getFontHeight() const override; - virtual int getMaxCharWidth() const override; - virtual int getCharWidth(uint32 chr) const override; - virtual int getKerningOffset(uint32 left, uint32 right) const override; - virtual void drawChar(Graphics::Surface *dst, uint32 chr, int x, int y, uint32 color) const override; + int getFontHeight() const override; + int getMaxCharWidth() const override; + int getCharWidth(uint32 chr) const override; + int getKerningOffset(uint32 left, uint32 right) const override; + void drawChar(Graphics::Surface *dst, uint32 chr, int x, int y, uint32 color) const override; protected: virtual uint8 transformColor(uint8 baseColor, uint8 glyphColor) const; @@ -69,7 +69,7 @@ public: SpeechFont(); protected: - virtual uint8 transformColor(uint8 baseColor, uint8 glyphColor) const override; + uint8 transformColor(uint8 baseColor, uint8 glyphColor) const override; }; } diff --git a/engines/mutationofjb/gamedata.h b/engines/mutationofjb/gamedata.h index e4bc6116080..4ee788bb36a 100644 --- a/engines/mutationofjb/gamedata.h +++ b/engines/mutationofjb/gamedata.h @@ -106,7 +106,7 @@ struct Door : public Common::Serializable { * * @param sz Serializer. */ - virtual void saveLoadWithSerializer(Common::Serializer &sz) override; + void saveLoadWithSerializer(Common::Serializer &sz) override; /** * Check whether walk action used on this door causes implicit scene change. @@ -205,7 +205,7 @@ struct Object : public Common::Serializable { * * @param sz Serializer. */ - virtual void saveLoadWithSerializer(Common::Serializer &sz) override; + void saveLoadWithSerializer(Common::Serializer &sz) override; }; /** @@ -257,7 +257,7 @@ struct Static : public Common::Serializable { * * @param sz Serializer. */ - virtual void saveLoadWithSerializer(Common::Serializer &sz) override; + void saveLoadWithSerializer(Common::Serializer &sz) override; /** * Check whether this static is combinable. @@ -307,7 +307,7 @@ struct Bitmap : public Common::Serializable { * * @param sz Serializer. */ - virtual void saveLoadWithSerializer(Common::Serializer &sz) override; + void saveLoadWithSerializer(Common::Serializer &sz) override; }; /** @@ -423,7 +423,7 @@ struct Scene : Common::Serializable { * * @param sz Serializer. */ - virtual void saveLoadWithSerializer(Common::Serializer &sz) override; + void saveLoadWithSerializer(Common::Serializer &sz) override; }; struct ConversationInfo { @@ -461,7 +461,7 @@ public: * * @param sz Serializer. */ - virtual void saveLoadWithSerializer(Common::Serializer &sz) override; + void saveLoadWithSerializer(Common::Serializer &sz) override; uint8 _currentScene; // Persistent. uint8 _lastScene; diff --git a/engines/mutationofjb/gamescreen.cpp b/engines/mutationofjb/gamescreen.cpp index d7abcb11dd4..6a51a5a0992 100644 --- a/engines/mutationofjb/gamescreen.cpp +++ b/engines/mutationofjb/gamescreen.cpp @@ -230,8 +230,8 @@ void GameScreen::refreshAfterSceneChanged() { class InventoryAnimationDecoderCallback : public AnimationDecoderCallback { public: InventoryAnimationDecoderCallback(GameScreen &gui) : _gui(gui) {} - virtual void onFrame(int frameNo, Graphics::Surface &surface) override; - virtual void onPaletteUpdated(byte palette[PALETTE_SIZE]) override; + void onFrame(int frameNo, Graphics::Surface &surface) override; + void onPaletteUpdated(byte palette[PALETTE_SIZE]) override; private: GameScreen &_gui; }; @@ -257,8 +257,8 @@ bool GameScreen::loadInventoryGfx() { class HudAnimationDecoderCallback : public AnimationDecoderCallback { public: HudAnimationDecoderCallback(GameScreen &gui) : _gui(gui) {} - virtual void onFrame(int frameNo, Graphics::Surface &surface) override; - virtual void onPaletteUpdated(byte palette[PALETTE_SIZE]) override; + void onFrame(int frameNo, Graphics::Surface &surface) override; + void onPaletteUpdated(byte palette[PALETTE_SIZE]) override; private: GameScreen &_gui; }; diff --git a/engines/mutationofjb/gamescreen.h b/engines/mutationofjb/gamescreen.h index 37d5251217c..10f6aca38ca 100644 --- a/engines/mutationofjb/gamescreen.h +++ b/engines/mutationofjb/gamescreen.h @@ -59,19 +59,19 @@ public: friend class HudAnimationDecoderCallback; GameScreen(Game &game, Graphics::Screen *screen); - ~GameScreen(); + ~GameScreen() override; bool init(); - virtual void handleEvent(const Common::Event &event) override; + void handleEvent(const Common::Event &event) override; - virtual void onInventoryChanged() override; - virtual void onButtonClicked(ButtonWidget *) override; - virtual void onInventoryItemHovered(InventoryWidget *widget, int posInWidget) override; - virtual void onInventoryItemClicked(InventoryWidget *widget, int posInWidget) override; - virtual void onGameDoorClicked(GameWidget *, Door *door) override; - virtual void onGameStaticClicked(GameWidget *, Static *stat) override; - virtual void onGameEntityHovered(GameWidget *, const Common::String &entity) override; + void onInventoryChanged() override; + void onButtonClicked(ButtonWidget *) override; + void onInventoryItemHovered(InventoryWidget *widget, int posInWidget) override; + void onInventoryItemClicked(InventoryWidget *widget, int posInWidget) override; + void onGameDoorClicked(GameWidget *, Door *door) override; + void onGameStaticClicked(GameWidget *, Static *stat) override; + void onGameEntityHovered(GameWidget *, const Common::String &entity) override; ConversationWidget &getConversationWidget(); diff --git a/engines/mutationofjb/inventory.h b/engines/mutationofjb/inventory.h index 2f9428add78..fab04de3ef8 100644 --- a/engines/mutationofjb/inventory.h +++ b/engines/mutationofjb/inventory.h @@ -60,7 +60,7 @@ public: void setObserver(InventoryObserver *observer); - virtual void saveLoadWithSerializer(Common::Serializer &sz) override; + void saveLoadWithSerializer(Common::Serializer &sz) override; private: void rotateItemsRight(uint n); diff --git a/engines/mutationofjb/mutationofjb.h b/engines/mutationofjb/mutationofjb.h index 64e52aac02b..cedb7539982 100644 --- a/engines/mutationofjb/mutationofjb.h +++ b/engines/mutationofjb/mutationofjb.h @@ -58,18 +58,18 @@ public: }; MutationOfJBEngine(OSystem *syst, const ADGameDescription *gameDesc); - ~MutationOfJBEngine(); + ~MutationOfJBEngine() override; - virtual Common::Error run() override; + Common::Error run() override; Graphics::Screen *getScreen() const; Game &getGame(); void setCursorState(CursorState cursorState); - virtual bool hasFeature(EngineFeature f) const override; - virtual bool canLoadGameStateCurrently() override; - virtual Common::Error loadGameState(int slot) override; - virtual bool canSaveGameStateCurrently() override; - virtual Common::Error saveGameState(int slot, const Common::String &desc) override; + bool hasFeature(EngineFeature f) const override; + bool canLoadGameStateCurrently() override; + Common::Error loadGameState(int slot) override; + bool canSaveGameStateCurrently() override; + Common::Error saveGameState(int slot, const Common::String &desc) override; const ADGameDescription *getGameDescription() const; diff --git a/engines/mutationofjb/room.cpp b/engines/mutationofjb/room.cpp index 09c0f29f27e..f6d52499e4c 100644 --- a/engines/mutationofjb/room.cpp +++ b/engines/mutationofjb/room.cpp @@ -43,8 +43,8 @@ enum { class RoomAnimationDecoderCallback : public AnimationDecoderCallback { public: RoomAnimationDecoderCallback(Room &room) : _room(room) {} - virtual void onFrame(int frameNo, Graphics::Surface &surface) override; - virtual void onPaletteUpdated(byte palette[PALETTE_SIZE]) override; + void onFrame(int frameNo, Graphics::Surface &surface) override; + void onPaletteUpdated(byte palette[PALETTE_SIZE]) override; private: Room &_room; }; diff --git a/engines/mutationofjb/tasks/conversationtask.h b/engines/mutationofjb/tasks/conversationtask.h index 9522876a27f..7098acbc395 100644 --- a/engines/mutationofjb/tasks/conversationtask.h +++ b/engines/mutationofjb/tasks/conversationtask.h @@ -34,12 +34,12 @@ class ScriptExecutionContext; class ConversationTask : public Task, public ConversationWidgetCallback { public: ConversationTask(uint8 sceneId, const ConversationInfo &convInfo, TalkCommand::Mode mode) : _sceneId(sceneId), _convInfo(convInfo), _mode(mode), _currentGroupIndex(0), _currentItem(nullptr), _substate(IDLE), _haveChoices(false), _innerExecCtx(nullptr) {} - virtual ~ConversationTask() {} + ~ConversationTask() override {} - virtual void start() override; - virtual void update() override; + void start() override; + void update() override; - virtual void onChoiceClicked(ConversationWidget *, int response, uint32 data) override; + void onChoiceClicked(ConversationWidget *, int response, uint32 data) override; private: void showChoicesOrPick(); const ConversationInfo::ItemGroup &getCurrentGroup() const; diff --git a/engines/mutationofjb/tasks/objectanimationtask.h b/engines/mutationofjb/tasks/objectanimationtask.h index 45e83b3147a..ca2b20029b6 100644 --- a/engines/mutationofjb/tasks/objectanimationtask.h +++ b/engines/mutationofjb/tasks/objectanimationtask.h @@ -35,8 +35,8 @@ class ObjectAnimationTask : public Task { public: ObjectAnimationTask(); - virtual void start() override; - virtual void update() override; + void start() override; + void update() override; /** * Advances every object animation in the current scene to the next frame. diff --git a/engines/mutationofjb/tasks/saytask.h b/engines/mutationofjb/tasks/saytask.h index 2200436b86d..0bc903e42fd 100644 --- a/engines/mutationofjb/tasks/saytask.h +++ b/engines/mutationofjb/tasks/saytask.h @@ -36,9 +36,9 @@ class SayTask : public Task { public: SayTask(const Common::String &toSay, uint8 color); - virtual void start() override; - virtual void update() override; - virtual void stop() override; + void start() override; + void update() override; + void stop() override; private: void drawSubtitle(const Common::String &text, int16 talkX, int16 talkY, uint8 color); diff --git a/engines/mutationofjb/tasks/sequentialtask.h b/engines/mutationofjb/tasks/sequentialtask.h index 1c00751a615..2f16cfaaf91 100644 --- a/engines/mutationofjb/tasks/sequentialtask.h +++ b/engines/mutationofjb/tasks/sequentialtask.h @@ -34,8 +34,8 @@ class SequentialTask : public Task { public: SequentialTask(const TaskPtrs &tasks); - virtual void start() override; - virtual void update() override; + void start() override; + void update() override; private: void runTasks(); diff --git a/engines/mutationofjb/widgets/buttonwidget.h b/engines/mutationofjb/widgets/buttonwidget.h index ae544b2508b..067b25f2e4d 100644 --- a/engines/mutationofjb/widgets/buttonwidget.h +++ b/engines/mutationofjb/widgets/buttonwidget.h @@ -41,10 +41,10 @@ public: ButtonWidget(GuiScreen &gui, const Common::Rect &area, const Graphics::Surface &normalSurface, const Graphics::Surface &pressedSurface); void setCallback(ButtonWidgetCallback *callback); - virtual void handleEvent(const Common::Event &event) override; + void handleEvent(const Common::Event &event) override; protected: - virtual void draw(Graphics::ManagedSurface &) override; + void draw(Graphics::ManagedSurface &) override; private: Graphics::Surface _normalSurface; diff --git a/engines/mutationofjb/widgets/conversationwidget.h b/engines/mutationofjb/widgets/conversationwidget.h index ea6e49f8075..16d1f310fe8 100644 --- a/engines/mutationofjb/widgets/conversationwidget.h +++ b/engines/mutationofjb/widgets/conversationwidget.h @@ -48,10 +48,10 @@ public: void setChoice(int choiceNo, const Common::String &str, uint32 data = 0); void clearChoices(); - virtual void handleEvent(const Common::Event &event) override; + void handleEvent(const Common::Event &event) override; protected: - virtual void draw(Graphics::ManagedSurface &surface) override; + void draw(Graphics::ManagedSurface &surface) override; private: Graphics::Surface _surface; diff --git a/engines/mutationofjb/widgets/gamewidget.h b/engines/mutationofjb/widgets/gamewidget.h index 29d44a63034..95bf4adac47 100644 --- a/engines/mutationofjb/widgets/gamewidget.h +++ b/engines/mutationofjb/widgets/gamewidget.h @@ -58,11 +58,11 @@ public: _callback = callback; } - virtual void handleEvent(const Common::Event &); + void handleEvent(const Common::Event &) override; void clearState(); protected: - virtual void draw(Graphics::ManagedSurface &); + void draw(Graphics::ManagedSurface &) override; private: /** diff --git a/engines/mutationofjb/widgets/imagewidget.h b/engines/mutationofjb/widgets/imagewidget.h index 80f5537f6d9..65d07ac54b8 100644 --- a/engines/mutationofjb/widgets/imagewidget.h +++ b/engines/mutationofjb/widgets/imagewidget.h @@ -33,7 +33,7 @@ public: ImageWidget(GuiScreen &gui, const Common::Rect &area, const Graphics::Surface &image); protected: - virtual void draw(Graphics::ManagedSurface &surface) override; + void draw(Graphics::ManagedSurface &surface) override; private: Graphics::Surface _image; diff --git a/engines/mutationofjb/widgets/inventorywidget.h b/engines/mutationofjb/widgets/inventorywidget.h index 1819aa18217..e655891a699 100644 --- a/engines/mutationofjb/widgets/inventorywidget.h +++ b/engines/mutationofjb/widgets/inventorywidget.h @@ -64,10 +64,10 @@ public: _callback = callback; } - virtual void handleEvent(const Common::Event &event) override; + void handleEvent(const Common::Event &event) override; protected: - virtual void draw(Graphics::ManagedSurface &surface) override; + void draw(Graphics::ManagedSurface &surface) override; private: void drawInventoryItem(Graphics::ManagedSurface &surface, const Common::String &item, int pos); diff --git a/engines/mutationofjb/widgets/labelwidget.h b/engines/mutationofjb/widgets/labelwidget.h index c87099671be..b432ee86ba3 100644 --- a/engines/mutationofjb/widgets/labelwidget.h +++ b/engines/mutationofjb/widgets/labelwidget.h @@ -38,7 +38,7 @@ public: void setText(const Common::String &text); protected: - virtual void draw(Graphics::ManagedSurface &) override; + void draw(Graphics::ManagedSurface &) override; private: uint8 _backgroundColor;