diff options
author | Andrei Karas <akaras@inbox.ru> | 2012-09-22 02:34:48 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2012-09-22 21:22:21 +0300 |
commit | 4a5cdfe19cbb50e3b58149c6e91312366ee4b771 (patch) | |
tree | 7a2bbae95b5f6642731f2a1257913baad71d028d /src/localplayer.h | |
parent | 3dcf21babe03cee5080a25e787e1d7e72124288e (diff) | |
download | manaplus-4a5cdfe19cbb50e3b58149c6e91312366ee4b771.tar.gz manaplus-4a5cdfe19cbb50e3b58149c6e91312366ee4b771.tar.bz2 manaplus-4a5cdfe19cbb50e3b58149c6e91312366ee4b771.tar.xz manaplus-4a5cdfe19cbb50e3b58149c6e91312366ee4b771.zip |
Add override keyword to most overriden methods.
Diffstat (limited to 'src/localplayer.h')
-rw-r--r-- | src/localplayer.h | 22 |
1 files changed, 12 insertions, 10 deletions
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; |