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/inventoryhandler.h | |
parent | 53530f76275df76406a9ce438a33df78c50d0948 (diff) | |
download | mv-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.gz mv-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.bz2 mv-dba0611175c8d4a56dfbc918ccef139351e5c3e0.tar.xz mv-dba0611175c8d4a56dfbc918ccef139351e5c3e0.zip |
Revert "Remove override keyword, if it present with final."
This reverts commit 55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d.
Diffstat (limited to 'src/net/tmwa/inventoryhandler.h')
-rw-r--r-- | src/net/tmwa/inventoryhandler.h | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/src/net/tmwa/inventoryhandler.h b/src/net/tmwa/inventoryhandler.h index 5b4cdba52..1bbbf0f3b 100644 --- a/src/net/tmwa/inventoryhandler.h +++ b/src/net/tmwa/inventoryhandler.h @@ -37,49 +37,49 @@ class InventoryHandler final : public Ea::InventoryHandler ~InventoryHandler(); - void equipItem(const Item *const item) const final; + void equipItem(const Item *const item) const override final; - void unequipItem(const Item *const item) const final; + void unequipItem(const Item *const item) const override final; - void useItem(const Item *const item) const final; + void useItem(const Item *const item) const override final; void dropItem(const Item *const item, - const int amount) const final; + const int amount) const override final; - void closeStorage() const final; + void closeStorage() const override final; void moveItem2(const InventoryTypeT source, const int slot, const int amount, - const InventoryTypeT destination) const final; + const InventoryTypeT destination) const override final; - void useCard(const Item *const item) final A_CONST; + void useCard(const Item *const item) override final A_CONST; void insertCard(const int cardIndex, - const int itemIndex) const final A_CONST; + const int itemIndex) const override final A_CONST; void favoriteItem(const Item *const item, - const bool favorite) const final A_CONST; + const bool favorite) const override final A_CONST; - void selectEgg(const Item *const item) const final A_CONST; + void selectEgg(const Item *const item) const override final A_CONST; int convertFromServerSlot(const int serverSlot) - const final A_WARN_UNUSED; + const override final A_WARN_UNUSED; void selectCart(const BeingId accountId, - const int type) const final; + const int type) const override final; - void identifyItem(const Item *const item) const final; + void identifyItem(const Item *const item) const override final; void mergeItemsAck(const std::vector<Item*> &items) const - final; + override final; - void mergetItemsCancel() const final; + void mergetItemsCancel() const override final; - int getProjectileSlot() const final + int getProjectileSlot() const override final { return 10; } - int getItemIndex() const final A_WARN_UNUSED + int getItemIndex() const override final A_WARN_UNUSED { return 0; } }; |