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.cpp | |
| 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.cpp')
| -rw-r--r-- | src/inventory.cpp | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/src/inventory.cpp b/src/inventory.cpp index cdd7b61c..80bc582b 100644 --- a/src/inventory.cpp +++ b/src/inventory.cpp @@ -37,8 +37,9 @@ struct SlotUsed : public std::unary_function<Item*, bool> } }; -Inventory::Inventory(int size): - mSize(size) +Inventory::Inventory(int size, int offset): + mSize(size), + mOffset(offset) { mItems = new Item*[mSize]; std::fill_n(mItems, mSize, (Item*) 0); @@ -134,11 +135,7 @@ bool Inventory::contains(Item *item) const int Inventory::getFreeSlot() const { -#ifdef TMWSERV_SUPPORT - Item **i = std::find_if(mItems, mItems + mSize, -#else - Item **i = std::find_if(mItems + 2, mItems + mSize, -#endif + Item **i = std::find_if(mItems + mOffset, mItems + mSize, std::not1(SlotUsed())); return (i == mItems + mSize) ? -1 : (i - mItems); } @@ -156,3 +153,8 @@ int Inventory::getLastUsedSlot() const return -1; } + +int Inventory::getInventorySize() const +{ + return mSize - mOffset; +} |