summaryrefslogtreecommitdiff
path: root/src/net/tmwa/mercenaryhandler.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/net/tmwa/mercenaryhandler.h
parent53530f76275df76406a9ce438a33df78c50d0948 (diff)
downloadmanaverse-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.gz
manaverse-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.bz2
manaverse-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.xz
manaverse-dba0611175c8d4a56dfbc918ccef139351e5c3e0.zip
Revert "Remove override keyword, if it present with final."
This reverts commit 55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d.
Diffstat (limited to 'src/net/tmwa/mercenaryhandler.h')
-rw-r--r--src/net/tmwa/mercenaryhandler.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/net/tmwa/mercenaryhandler.h b/src/net/tmwa/mercenaryhandler.h
index e17c31396..760bdf8ac 100644
--- a/src/net/tmwa/mercenaryhandler.h
+++ b/src/net/tmwa/mercenaryhandler.h
@@ -35,21 +35,21 @@ class MercenaryHandler final : public Net::MercenaryHandler
A_DELETE_COPY(MercenaryHandler)
- void fire() const final A_CONST;
+ void fire() const override final A_CONST;
- void moveToMaster() const final A_CONST;
+ void moveToMaster() const override final A_CONST;
- void move(const int x, const int y) const final A_CONST;
+ void move(const int x, const int y) const override final A_CONST;
void attack(const BeingId targetId,
- const Keep keep) const final A_CONST;
+ const Keep keep) const override final A_CONST;
- void talk(const std::string &restrict text) const final
+ void talk(const std::string &restrict text) const override final
A_CONST;
- void emote(const uint8_t emoteId) const final A_CONST;
+ void emote(const uint8_t emoteId) const override final A_CONST;
- void setDirection(const unsigned char type) const final
+ void setDirection(const unsigned char type) const override final
A_CONST;
};