From 4a5cdfe19cbb50e3b58149c6e91312366ee4b771 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sat, 22 Sep 2012 02:34:48 +0300 Subject: Add override keyword to most overriden methods. --- src/localplayer.h | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) (limited to 'src/localplayer.h') diff --git a/src/localplayer.h b/src/localplayer.h index cfd2902d2..79c9b9086 100644 --- a/src/localplayer.h +++ b/src/localplayer.h @@ -46,7 +46,7 @@ struct SkillInfo; class AwayListener final : public gcn::ActionListener { public: - void action(const gcn::ActionEvent &event); + void action(const gcn::ActionEvent &event) override; }; /** @@ -81,11 +81,12 @@ class LocalPlayer final : public Being, */ ~LocalPlayer(); - virtual void logic(); + virtual void logic() override; void slowLogic(); - virtual void setAction(const Action &action, const int attackType = 0); + virtual void setAction(const Action &action, + const int attackType = 0) override; /** * Compute the next pathnode location when walking using keyboard. @@ -99,7 +100,7 @@ class LocalPlayer final : public Being, * Also, when specified, it picks up an item at the end of a path * or attack target. */ - virtual void nextTile() + virtual void nextTile() override { nextTile(0); } virtual void nextTile(unsigned char dir); @@ -123,7 +124,7 @@ class LocalPlayer final : public Being, * Called when an ActorSprite has been destroyed. * @param actorSprite the ActorSprite being destroyed. */ - void actorSpriteDestroyed(const ActorSprite &actorSprite); + void actorSpriteDestroyed(const ActorSprite &actorSprite) override; /** * Gets the attack range. @@ -204,7 +205,7 @@ class LocalPlayer final : public Being, const unsigned char color, const int floorItemId, const unsigned char fail); - int getLevel() const; + int getLevel() const override; int getTargetTime(); @@ -395,9 +396,10 @@ class LocalPlayer final : public Being, /** * Called when a option (set with config.addListener()) is changed */ - void optionChanged(const std::string &value); + void optionChanged(const std::string &value) override; - void processEvent(Channels channel, const DepricatedEvent &event); + void processEvent(Channels channel, + const DepricatedEvent &event) override; /** * set a following player. @@ -477,7 +479,7 @@ class LocalPlayer final : public Being, void resetYellowBar(); - virtual unsigned char getWalkMask() const; + virtual unsigned char getWalkMask() const override; void saveHomes(); @@ -520,7 +522,7 @@ class LocalPlayer final : public Being, std::string getGameModifiersString(); protected: - void updateCoords(); + void updateCoords() override; /** Whether or not the name settings have changed */ bool mUpdateName; -- cgit v1.2.3-60-g2f50