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/tmwa/npchandler.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/tmwa/npchandler.h')
-rw-r--r-- | src/net/tmwa/npchandler.h | 42 |
1 files changed, 21 insertions, 21 deletions
diff --git a/src/net/tmwa/npchandler.h b/src/net/tmwa/npchandler.h index 218d49777..b6483772d 100644 --- a/src/net/tmwa/npchandler.h +++ b/src/net/tmwa/npchandler.h @@ -35,64 +35,64 @@ class NpcHandler final : public Ea::NpcHandler A_DELETE_COPY(NpcHandler) - void talk(const BeingId npcId) const final; + void talk(const BeingId npcId) const override final; - void nextDialog(const BeingId npcId) const final; + void nextDialog(const BeingId npcId) const override final; - void closeDialog(const BeingId npcId) final; + void closeDialog(const BeingId npcId) override final; void listInput(const BeingId npcId, - const unsigned char value) const final; + const unsigned char value) const override final; void integerInput(const BeingId npcId, - const int value) const final; + const int value) const override final; void stringInput(const BeingId npcId, - const std::string &value) const final; + const std::string &value) const override final; - void buy(const BeingId beingId) const final; + void buy(const BeingId beingId) const override final; - void sell(const BeingId beingId) const final; + void sell(const BeingId beingId) const override final; void buyItem(const BeingId beingId, const int itemId, const ItemColor color, - const int amount) const final; + const int amount) const override final; - void buyItems(std::vector<ShopItem*> &items) const final + void buyItems(std::vector<ShopItem*> &items) const override final A_CONST; void sellItem(const BeingId beingId, const int itemId, - const int amount) const final; + const int amount) const override final; - void sellItems(std::vector<ShopItem*> &items) const final + void sellItems(std::vector<ShopItem*> &items) const override final A_CONST; - void completeProgressBar() const final A_CONST; + void completeProgressBar() const override final A_CONST; BeingId getNpc(Net::MessageIn &msg, - const NpcActionT action) final; + const NpcActionT action) override final; void produceMix(const int nameId, const int materialId1, const int materialId2, - const int materialId3) const final A_CONST; + const int materialId3) const override final A_CONST; #ifdef EATHENA_SUPPORT void cooking(const CookingTypeT type, - const int nameId) const final A_CONST; + const int nameId) const override final A_CONST; #endif - void repair(const int index) const final A_CONST; + void repair(const int index) const override final A_CONST; - void refine(const int index) const final A_CONST; + void refine(const int index) const override final A_CONST; - void identify(const int index) const final A_CONST; + void identify(const int index) const override final A_CONST; - void selectArrow(const int nameId) const final A_CONST; + void selectArrow(const int nameId) const override final A_CONST; - void selectAutoSpell(const int skillId) const final A_CONST; + void selectAutoSpell(const int skillId) const override final A_CONST; }; } // namespace TmwAthena |