summaryrefslogtreecommitdiff
path: root/src/being/being.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2016-04-17 23:06:06 +0300
committerAndrei Karas <akaras@inbox.ru>2016-04-17 23:06:56 +0300
commitdba0611175c8d4a56dfbc918ccef139351e5c3e0 (patch)
treeb3c7a5684604facc0f0f5656fe373958c53dc5ad /src/being/being.h
parent53530f76275df76406a9ce438a33df78c50d0948 (diff)
downloadplus-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/being.h')
-rw-r--r--src/being/being.h18
1 files changed, 9 insertions, 9 deletions
diff --git a/src/being/being.h b/src/being/being.h
index b0c1c26ea..7010a2918 100644
--- a/src/being/being.h
+++ b/src/being/being.h
@@ -106,7 +106,7 @@ class Being notfinal : public ActorSprite,
virtual ~Being();
- ActorTypeT getType() const restrict2 noexcept final
+ ActorTypeT getType() const restrict2 noexcept override final
A_WARN_UNUSED
{ return mType; }
@@ -364,7 +364,7 @@ class Being notfinal : public ActorSprite,
const BeingInfo *getInfo() const restrict2 noexcept A_WARN_UNUSED
{ return mInfo; }
- TargetCursorSizeT getTargetCursorSize() const restrict2 final
+ TargetCursorSizeT getTargetCursorSize() const restrict2 override final
A_WARN_UNUSED;
int getTargetOffsetX() const restrict2 override A_WARN_UNUSED
@@ -484,13 +484,13 @@ class Being notfinal : public ActorSprite,
/**
* Returns the horizontal size of the current base sprite of the being.
*/
- int getWidth() const restrict2 final A_WARN_UNUSED
+ int getWidth() const restrict2 override final A_WARN_UNUSED
{ return std::max(CompoundSprite::getWidth(), DEFAULT_BEING_WIDTH); }
/**
* Returns the vertical size of the current base sprite of the being.
*/
- int getHeight() const restrict2 final A_WARN_UNUSED
+ int getHeight() const restrict2 override final A_WARN_UNUSED
{ return std::max(CompoundSprite::getHeight(), DEFAULT_BEING_HEIGHT); }
/**
@@ -529,7 +529,7 @@ class Being notfinal : public ActorSprite,
void drawSpritesSDL(Graphics *restrict const graphics,
const int posX,
const int posY) const
- restrict2 final A_NONNULL(2);
+ restrict2 override final A_NONNULL(2);
void drawHpBar(Graphics *restrict const graphics,
const int maxHP,
@@ -629,7 +629,7 @@ class Being notfinal : public ActorSprite,
void draw(Graphics *restrict const graphics,
const int offsetX,
const int offsetY) const
- restrict2 final A_NONNULL(2);
+ restrict2 override final A_NONNULL(2);
void drawPlayer(Graphics *restrict const graphics,
const int offsetX,
@@ -916,14 +916,14 @@ class Being notfinal : public ActorSprite,
{ return mLastAttackY; }
#ifdef EATHENA_SUPPORT
- void setTrickDead(const bool b) restrict2 final;
+ void setTrickDead(const bool b) restrict2 override final;
void setChat(ChatObject *restrict const obj) restrict2;
ChatObject *getChat() const restrict2 noexcept
{ return mChat; }
- void setRiding(const bool b) restrict2 final;
+ void setRiding(const bool b) restrict2 override final;
void setHorse(const int horseId) restrict2;
@@ -944,7 +944,7 @@ class Being notfinal : public ActorSprite,
unsigned int getSpiritBalls() const restrict2 noexcept A_WARN_UNUSED
{ return mSpiritBalls; }
- void stopCast(const bool b) final;
+ void stopCast(const bool b) override final;
void setCreatorId(const BeingId id)
{ mCreatorId = id; }