summaryrefslogtreecommitdiff
path: root/src/being/localplayer.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-04-17 20:03:14 +0300
committerAndrei Karas <akaras@inbox.ru>2016-04-17 20:03:14 +0300
commit55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d (patch)
treeb1108bef76eed589fcb0028c4bd97f14510e940f /src/being/localplayer.h
parent72b9b0b8b7f3e0b60bf7a926b44aaa589dd131e8 (diff)
downloadmv-55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d.tar.gz
mv-55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d.tar.bz2
mv-55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d.tar.xz
mv-55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d.zip
Remove override keyword, if it present with final.
Diffstat (limited to 'src/being/localplayer.h')
-rw-r--r--src/being/localplayer.h30
1 files changed, 15 insertions, 15 deletions
diff --git a/src/being/localplayer.h b/src/being/localplayer.h
index ccecb18fb..efab5ff3c 100644
--- a/src/being/localplayer.h
+++ b/src/being/localplayer.h
@@ -66,12 +66,12 @@ class LocalPlayer final : public Being,
*/
~LocalPlayer();
- void logic() override final;
+ void logic() final;
void slowLogic();
void setAction(const BeingActionT &action,
- const int attackType = 0) override final;
+ const int attackType = 0) 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() override final
+ void nextTile() 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)
- override final;
+ final;
/**
* Gets the attack range.
@@ -184,7 +184,7 @@ class LocalPlayer final : public Being,
const BeingId floorItemId,
const PickupT fail);
- int getLevel() const override final A_WARN_UNUSED;
+ int getLevel() const 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) override final;
+ void setMap(Map *const map) 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) override final;
+ void optionChanged(const std::string &value) final;
- void playerDeath() override final;
+ void playerDeath() final;
/**
* set a following player.
@@ -365,7 +365,7 @@ class LocalPlayer final : public Being,
void checkNewName(Being *const being);
- unsigned char getBlockWalkMask() const override final
+ unsigned char getBlockWalkMask() const 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 override final
+ int getLastAttackX() const final
{ return mTarget ? mTarget->mX : mLastAttackX; }
- int getLastAttackY() const override final
+ int getLastAttackY() const final
{ return mTarget ? mTarget->mY : mLastAttackY; }
void attributeChanged(const AttributesT id,
const int oldVal,
- const int newVal) override final;
+ const int newVal) final;
void statChanged(const AttributesT id,
const int oldVal1,
- const int oldVal2) override final;
+ const int oldVal2) final;
void updateMusic() const;
@@ -424,10 +424,10 @@ class LocalPlayer final : public Being,
bool canMove() const;
protected:
- void updateCoords() override final;
+ void updateCoords() final;
void handleStatusEffect(const StatusEffect *const effect,
- const int32_t effectId) override final;
+ const int32_t effectId) final;
void startWalking(const unsigned char dir);