summaryrefslogtreecommitdiff
path: root/src/being/flooritem.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/flooritem.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/flooritem.h')
-rw-r--r--src/being/flooritem.h8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/being/flooritem.h b/src/being/flooritem.h
index 1b5b87d3e..b62d00e7b 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 override final A_WARN_UNUSED
+ ActorTypeT getType() const noexcept final A_WARN_UNUSED
{ return ActorType::FloorItem; }
void draw(Graphics *const graphics,
const int offsetX, const int offsetY)
- const override final A_NONNULL(2);
+ const 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 override final A_WARN_UNUSED
+ int getTileX() const final A_WARN_UNUSED
{ return mX; }
- int getTileY() const override final A_WARN_UNUSED
+ int getTileY() const final A_WARN_UNUSED
{ return mY; }
void incrementPickup()