diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-02-18 13:20:34 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-02-18 13:20:34 +0300 |
commit | 0c863b2e2cc7f5be6baa918c8fffb0ee44c02cc7 (patch) | |
tree | aebc2d6eae2325c1c077849cc43f8ac07d6a76f6 /src/being | |
parent | 4b754c29f7fe0c7531fa6ce68a70a913e7172337 (diff) | |
download | manaverse-0c863b2e2cc7f5be6baa918c8fffb0ee44c02cc7.tar.gz manaverse-0c863b2e2cc7f5be6baa918c8fffb0ee44c02cc7.tar.bz2 manaverse-0c863b2e2cc7f5be6baa918c8fffb0ee44c02cc7.tar.xz manaverse-0c863b2e2cc7f5be6baa918c8fffb0ee44c02cc7.zip |
Add missing override keywords.
Diffstat (limited to 'src/being')
-rw-r--r-- | src/being/being.h | 16 | ||||
-rw-r--r-- | src/being/localplayer.h | 2 |
2 files changed, 9 insertions, 9 deletions
diff --git a/src/being/being.h b/src/being/being.h index 12b197a23..b587a8d1f 100644 --- a/src/being/being.h +++ b/src/being/being.h @@ -169,13 +169,13 @@ class Being notfinal : public ActorSprite, /** * Returns the tile x coord */ - int getTileX() const A_WARN_UNUSED + int getTileX() const override A_WARN_UNUSED { return mX; } /** * Returns the tile y coord */ - int getTileY() const A_WARN_UNUSED + int getTileY() const override A_WARN_UNUSED { return mY; } /** @@ -352,7 +352,7 @@ class Being notfinal : public ActorSprite, /** * Get the number of layers used to draw the being */ - int getNumberOfLayers() const A_WARN_UNUSED + int getNumberOfLayers() const override A_WARN_UNUSED { return CompoundSprite::getNumberOfLayers(); } /** @@ -387,14 +387,14 @@ class Being notfinal : public ActorSprite, TargetCursorSize::Size getTargetCursorSize() const override final A_WARN_UNUSED; - int getTargetOffsetX() const A_WARN_UNUSED + int getTargetOffsetX() const override A_WARN_UNUSED { if (!mInfo) return 0; return mInfo->getTargetOffsetX(); } - int getTargetOffsetY() const A_WARN_UNUSED + int getTargetOffsetY() const override A_WARN_UNUSED { if (!mInfo) return 0; @@ -414,7 +414,7 @@ class Being notfinal : public ActorSprite, /** * Gets the way the monster blocks pathfinding for other objects */ - BlockType::BlockType getBlockType() const A_WARN_UNUSED + BlockType::BlockType getBlockType() const override A_WARN_UNUSED { if (!mInfo) return BlockType::NONE; @@ -865,11 +865,11 @@ class Being notfinal : public ActorSprite, */ void setPath(const Path &path); - int getSortPixelY() const A_WARN_UNUSED + int getSortPixelY() const override A_WARN_UNUSED { return static_cast<int>(mPos.y) - mYDiff - mSortOffsetY; } // { return static_cast<int>(mPos.y) - mYDiff - mSortOffsetY + 16; } - void setMap(Map *const map); + void setMap(Map *const map) override; void recreateItemParticles(); diff --git a/src/being/localplayer.h b/src/being/localplayer.h index bf342e8c3..9226c1806 100644 --- a/src/being/localplayer.h +++ b/src/being/localplayer.h @@ -281,7 +281,7 @@ class LocalPlayer final : public Being, /** * Sets the map the being is on */ - void setMap(Map *const map); + void setMap(Map *const map) override final; void addMessageToQueue(const std::string &message, const int color = UserPalette::EXP_INFO); |