summaryrefslogtreecommitdiff
path: root/src/inventory.h
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-01-24 15:31:06 +0300
committerAndrei Karas <akaras@inbox.ru>2015-01-24 15:31:06 +0300
commit3f5c128b889b4cb41f9782fe1531c55e7d07432f (patch)
treeb5903e10142f876d29bf4d4643261f1b058fefe9 /src/inventory.h
parentc53839e9125a72e2bbc5e479934b5b9111bef5d6 (diff)
downloadmv-3f5c128b889b4cb41f9782fe1531c55e7d07432f.tar.gz
mv-3f5c128b889b4cb41f9782fe1531c55e7d07432f.tar.bz2
mv-3f5c128b889b4cb41f9782fe1531c55e7d07432f.tar.xz
mv-3f5c128b889b4cb41f9782fe1531c55e7d07432f.zip
Move inventory type into separate file.
Diffstat (limited to 'src/inventory.h')
-rw-r--r--src/inventory.h15
1 files changed, 3 insertions, 12 deletions
diff --git a/src/inventory.h b/src/inventory.h
index 42ec86882..8438f63d7 100644
--- a/src/inventory.h
+++ b/src/inventory.h
@@ -23,6 +23,8 @@
#ifndef INVENTORY_H
#define INVENTORY_H
+#include "enums/inventorytype.h"
+
#include "enums/being/gender.h"
#include <list>
@@ -40,17 +42,6 @@ class Inventory final
static const int NO_SLOT_INDEX = -1; /**< Slot has no index. */
- enum
- {
- INVENTORY = 0,
- STORAGE,
- CART,
- TRADE,
- NPC,
- TYPE_END
- };
-
-
/**
* Constructor.
*
@@ -161,7 +152,7 @@ class Inventory final
{ return mType; }
bool isMainInventory() const A_WARN_UNUSED
- { return mType == INVENTORY; }
+ { return mType == InventoryType::INVENTORY; }
const Item *findItemBySprite(std::string spritePath,
const Gender::Type gender,