From dba0611175c8d4a56dfbc918ccef139351e5c3e0 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 17 Apr 2016 23:06:06 +0300 Subject: Revert "Remove override keyword, if it present with final." This reverts commit 55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d. --- src/being/flooritem.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/being/flooritem.h') diff --git a/src/being/flooritem.h b/src/being/flooritem.h index b62d00e7b..1b5b87d3e 100644 --- a/src/being/flooritem.h +++ b/src/being/flooritem.h @@ -68,12 +68,12 @@ class FloorItem final : public ActorSprite void postInit(Map *const map, int subX, int subY); - ActorTypeT getType() const noexcept final A_WARN_UNUSED + ActorTypeT getType() const noexcept override final A_WARN_UNUSED { return ActorType::FloorItem; } void draw(Graphics *const graphics, const int offsetX, const int offsetY) - const final A_NONNULL(2); + const override final A_NONNULL(2); /** * Returns the item ID. @@ -89,10 +89,10 @@ class FloorItem final : public ActorSprite std::string getName() const A_WARN_UNUSED; - int getTileX() const final A_WARN_UNUSED + int getTileX() const override final A_WARN_UNUSED { return mX; } - int getTileY() const final A_WARN_UNUSED + int getTileY() const override final A_WARN_UNUSED { return mY; } void incrementPickup() -- cgit v1.2.3-60-g2f50