diff options
| author | Andrei Karas <akaras@inbox.ru> | 2016-04-17 23:06:06 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2016-04-17 23:06:56 +0300 |
| commit | dba0611175c8d4a56dfbc918ccef139351e5c3e0 (patch) | |
| tree | b3c7a5684604facc0f0f5656fe373958c53dc5ad /src/net/eathena/mercenaryhandler.h | |
| parent | 53530f76275df76406a9ce438a33df78c50d0948 (diff) | |
| download | manaplus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.gz manaplus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.bz2 manaplus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.xz manaplus-dba0611175c8d4a56dfbc918ccef139351e5c3e0.zip | |
Revert "Remove override keyword, if it present with final."
This reverts commit 55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d.
Diffstat (limited to 'src/net/eathena/mercenaryhandler.h')
| -rw-r--r-- | src/net/eathena/mercenaryhandler.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/net/eathena/mercenaryhandler.h b/src/net/eathena/mercenaryhandler.h index 71994d9dc..d6eddd75b 100644 --- a/src/net/eathena/mercenaryhandler.h +++ b/src/net/eathena/mercenaryhandler.h @@ -32,20 +32,20 @@ class MercenaryHandler final : public Net::MercenaryHandler A_DELETE_COPY(MercenaryHandler) - void fire() const final; + void fire() const override final; - void moveToMaster() const final; + void moveToMaster() const override final; - void move(const int x, const int y) const final; + void move(const int x, const int y) const override final; void attack(const BeingId targetId, - const Keep keep) const final; + const Keep keep) const override final; - void talk(const std::string &restrict text) const final; + void talk(const std::string &restrict text) const override final; - void emote(const uint8_t emoteId) const final; + void emote(const uint8_t emoteId) const override final; - void setDirection(const unsigned char type) const final; + void setDirection(const unsigned char type) const override final; }; } // namespace EAthena |