diff options
author | Andrei Karas <akaras@inbox.ru> | 2016-04-17 23:06:06 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2016-04-17 23:06:56 +0300 |
commit | dba0611175c8d4a56dfbc918ccef139351e5c3e0 (patch) | |
tree | b3c7a5684604facc0f0f5656fe373958c53dc5ad /src/being/localplayer.h | |
parent | 53530f76275df76406a9ce438a33df78c50d0948 (diff) | |
download | plus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.gz plus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.bz2 plus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.xz plus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.zip |
Revert "Remove override keyword, if it present with final."
This reverts commit 55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d.
Diffstat (limited to 'src/being/localplayer.h')
-rw-r--r-- | src/being/localplayer.h | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/src/being/localplayer.h b/src/being/localplayer.h index efab5ff3c..ccecb18fb 100644 --- a/src/being/localplayer.h +++ b/src/being/localplayer.h @@ -66,12 +66,12 @@ class LocalPlayer final : public Being, */ ~LocalPlayer(); - void logic() final; + void logic() override final; void slowLogic(); void setAction(const BeingActionT &action, - const int attackType = 0) final; + const int attackType = 0) override final; /** * Compute the next pathnode location when walking using keyboard. @@ -86,7 +86,7 @@ class LocalPlayer final : public Being, * Also, when specified, it picks up an item at the end of a path * or attack target. */ - void nextTile() final + void nextTile() override final { nextTile(0); } void nextTile(unsigned char dir); @@ -98,7 +98,7 @@ class LocalPlayer final : public Being, * @param actorSprite the ActorSprite being destroyed. */ void actorSpriteDestroyed(const ActorSprite &actorSprite) - final; + override final; /** * Gets the attack range. @@ -184,7 +184,7 @@ class LocalPlayer final : public Being, const BeingId floorItemId, const PickupT fail); - int getLevel() const final A_WARN_UNUSED; + int getLevel() const override final A_WARN_UNUSED; /** Tells that the path has been set by mouse. */ void pathSetByMouse() @@ -277,7 +277,7 @@ class LocalPlayer final : public Being, /** * Sets the map the being is on */ - void setMap(Map *const map) final; + void setMap(Map *const map) override final; void addMessageToQueue(const std::string &message, const UserColorIdT color @@ -286,9 +286,9 @@ class LocalPlayer final : public Being, /** * Called when a option (set with config.addListener()) is changed */ - void optionChanged(const std::string &value) final; + void optionChanged(const std::string &value) override final; - void playerDeath() final; + void playerDeath() override final; /** * set a following player. @@ -365,7 +365,7 @@ class LocalPlayer final : public Being, void checkNewName(Being *const being); - unsigned char getBlockWalkMask() const final + unsigned char getBlockWalkMask() const override final A_CONST A_WARN_UNUSED; void saveHomes(); @@ -390,19 +390,19 @@ class LocalPlayer final : public Being, void setTestParticle(const std::string &fileName, const bool updateHash = true); - int getLastAttackX() const final + int getLastAttackX() const override final { return mTarget ? mTarget->mX : mLastAttackX; } - int getLastAttackY() const final + int getLastAttackY() const override final { return mTarget ? mTarget->mY : mLastAttackY; } void attributeChanged(const AttributesT id, const int oldVal, - const int newVal) final; + const int newVal) override final; void statChanged(const AttributesT id, const int oldVal1, - const int oldVal2) final; + const int oldVal2) override final; void updateMusic() const; @@ -424,10 +424,10 @@ class LocalPlayer final : public Being, bool canMove() const; protected: - void updateCoords() final; + void updateCoords() override final; void handleStatusEffect(const StatusEffect *const effect, - const int32_t effectId) final; + const int32_t effectId) override final; void startWalking(const unsigned char dir); |