diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-03-25 22:50:59 +0100 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2009-03-25 22:50:59 +0100 |
commit | cc79f0fe21e1a2ef73cbe987d54e848b9a47142d (patch) | |
tree | edd316eb6094f0c02d6d014385865dcd88a2bc56 /src/inventory.h | |
parent | b0df784f1be44a657ca8092069488602270629b7 (diff) | |
parent | 99e8a3fd77b63a029fe02dcf771b6af1aad252ed (diff) | |
download | mana-cc79f0fe21e1a2ef73cbe987d54e848b9a47142d.tar.gz mana-cc79f0fe21e1a2ef73cbe987d54e848b9a47142d.tar.bz2 mana-cc79f0fe21e1a2ef73cbe987d54e848b9a47142d.tar.xz mana-cc79f0fe21e1a2ef73cbe987d54e848b9a47142d.zip |
Merge branch 'eathena/master'
Conflicts:
A lot of files.
Diffstat (limited to 'src/inventory.h')
-rw-r--r-- | src/inventory.h | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/src/inventory.h b/src/inventory.h index d2a81edf..008b7ec4 100644 --- a/src/inventory.h +++ b/src/inventory.h @@ -24,13 +24,20 @@ class Item; +#ifdef EATHENA_SUPPORT +#define INVENTORY_SIZE 102 +#define STORAGE_SIZE 301 +#else +#define INVENTORY_SIZE 50 +#endif + class Inventory { public: /** * Constructor. */ - Inventory(int size); + Inventory(int size, int offset = 0); /** * Destructor. @@ -100,10 +107,16 @@ class Inventory */ int getLastUsedSlot() const; + /** + * Returns the number of slots available in the inventory. + */ + int getInventorySize() const; + static const int NO_SLOT_INDEX = -1; /**< Slot has no index. */ protected: Item **mItems; /**< The holder of items */ int mSize; /**< The max number of inventory items */ + int mOffset; /**< Offset used by the inventory */ }; #endif |