From 55480eb4477b2cf85af1bcdcc5e8ec4f4ce6682d Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Sun, 17 Apr 2016 20:03:14 +0300 Subject: Remove override keyword, if it present with final. --- src/net/tmwa/inventoryhandler.h | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) (limited to 'src/net/tmwa/inventoryhandler.h') diff --git a/src/net/tmwa/inventoryhandler.h b/src/net/tmwa/inventoryhandler.h index 1bbbf0f3b..5b4cdba52 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 override final; + void equipItem(const Item *const item) const final; - void unequipItem(const Item *const item) const override final; + void unequipItem(const Item *const item) const final; - void useItem(const Item *const item) const override final; + void useItem(const Item *const item) const final; void dropItem(const Item *const item, - const int amount) const override final; + const int amount) const final; - void closeStorage() const override final; + void closeStorage() const final; void moveItem2(const InventoryTypeT source, const int slot, const int amount, - const InventoryTypeT destination) const override final; + const InventoryTypeT destination) const final; - void useCard(const Item *const item) override final A_CONST; + void useCard(const Item *const item) final A_CONST; void insertCard(const int cardIndex, - const int itemIndex) const override final A_CONST; + const int itemIndex) const final A_CONST; void favoriteItem(const Item *const item, - const bool favorite) const override final A_CONST; + const bool favorite) const final A_CONST; - void selectEgg(const Item *const item) const override final A_CONST; + void selectEgg(const Item *const item) const final A_CONST; int convertFromServerSlot(const int serverSlot) - const override final A_WARN_UNUSED; + const final A_WARN_UNUSED; void selectCart(const BeingId accountId, - const int type) const override final; + const int type) const final; - void identifyItem(const Item *const item) const override final; + void identifyItem(const Item *const item) const final; void mergeItemsAck(const std::vector &items) const - override final; + final; - void mergetItemsCancel() const override final; + void mergetItemsCancel() const final; - int getProjectileSlot() const override final + int getProjectileSlot() const final { return 10; } - int getItemIndex() const override final A_WARN_UNUSED + int getItemIndex() const final A_WARN_UNUSED { return 0; } }; -- cgit v1.2.3-60-g2f50