summaryrefslogtreecommitdiff
path: root/src/resources/inventory/complexinventory.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/resources/inventory/complexinventory.h
parent53530f76275df76406a9ce438a33df78c50d0948 (diff)
downloadmv-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/resources/inventory/complexinventory.h')
-rw-r--r--src/resources/inventory/complexinventory.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/resources/inventory/complexinventory.h b/src/resources/inventory/complexinventory.h
index 52cade53c..996212d18 100644
--- a/src/resources/inventory/complexinventory.h
+++ b/src/resources/inventory/complexinventory.h
@@ -47,7 +47,7 @@ class ComplexInventory final : public Inventory
bool addVirtualItem(const Item *const item,
int index,
- const int amount) final;
+ const int amount) override final;
void setItem(const int index,
const int id,
@@ -59,7 +59,7 @@ class ComplexInventory final : public Inventory
const Damaged damaged,
const Favorite favorite,
const Equipm equipment,
- const Equipped equipped) final;
+ const Equipped equipped) override final;
};
#endif // RESOURCES_INVENTORY_COMPLEXINVENTORY_H