diff options
| author | Fate <fate-tmw@googlemail.com> | 2008-11-23 11:52:51 -0700 |
|---|---|---|
| committer | Fate <fate-tmw@googlemail.com> | 2008-11-23 11:52:51 -0700 |
| commit | ba0d53c6234562b1826dfeb58d02e49757c2ce5b (patch) | |
| tree | 2134447b73b89215c824dde6e6d520bbe35c8083 /src/inventory.cpp | |
| parent | d011f8f984f454a76adaf04142df0daa03dd00a8 (diff) | |
| parent | 31f40703d569478619952343bde3f73c3a576847 (diff) | |
| download | mana-ba0d53c6234562b1826dfeb58d02e49757c2ce5b.tar.gz mana-ba0d53c6234562b1826dfeb58d02e49757c2ce5b.tar.bz2 mana-ba0d53c6234562b1826dfeb58d02e49757c2ce5b.tar.xz mana-ba0d53c6234562b1826dfeb58d02e49757c2ce5b.zip | |
Merge branch '0.0' of git@gitorious.org:tmw/mainline into 0.0
Diffstat (limited to 'src/inventory.cpp')
| -rw-r--r-- | src/inventory.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/src/inventory.cpp b/src/inventory.cpp index 470b6c85..938d23d3 100644 --- a/src/inventory.cpp +++ b/src/inventory.cpp @@ -17,8 +17,6 @@ * You should have received a copy of the GNU General Public License * along with The Mana World; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * - * $Id$ */ #include "inventory.h" @@ -134,19 +132,19 @@ bool Inventory::contains(Item *item) const return false; } -int Inventory::getFreeSlot() +int Inventory::getFreeSlot() const { Item **i = std::find_if(mItems + 2, mItems + INVENTORY_SIZE, std::not1(SlotUsed())); return (i == mItems + INVENTORY_SIZE) ? -1 : (i - mItems); } -int Inventory::getNumberOfSlotsUsed() +int Inventory::getNumberOfSlotsUsed() const { return count_if(mItems, mItems + INVENTORY_SIZE, SlotUsed()); } -int Inventory::getLastUsedSlot() +int Inventory::getLastUsedSlot() const { for (int i = INVENTORY_SIZE - 1; i >= 0; i--) { if (SlotUsed()(mItems[i])) { @@ -156,3 +154,8 @@ int Inventory::getLastUsedSlot() return -1; } + +int Inventory::getInventorySize() const +{ + return INVENTORY_SIZE - 2; +} |