diff options
| author | Jared Adams <jaxad0127@gmail.com> | 2009-07-23 10:24:29 -0600 |
|---|---|---|
| committer | Jared Adams <jaxad0127@gmail.com> | 2009-07-23 10:31:36 -0600 |
| commit | 01263d9ebb304d9fba90d741bf849e0865e3c17d (patch) | |
| tree | 584bda0e0ec4a37b8fe911c6539ac29d54761f94 /src/inventory.cpp | |
| parent | 69db63d2537b959a3a994fd77ae0d630126fe7e5 (diff) | |
| download | mana-01263d9ebb304d9fba90d741bf849e0865e3c17d.tar.gz mana-01263d9ebb304d9fba90d741bf849e0865e3c17d.tar.bz2 mana-01263d9ebb304d9fba90d741bf849e0865e3c17d.tar.xz mana-01263d9ebb304d9fba90d741bf849e0865e3c17d.zip | |
Clear some more support ifdefs
Diffstat (limited to 'src/inventory.cpp')
| -rw-r--r-- | src/inventory.cpp | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/src/inventory.cpp b/src/inventory.cpp index 4f0a6860..202c3e52 100644 --- a/src/inventory.cpp +++ b/src/inventory.cpp @@ -29,11 +29,7 @@ struct SlotUsed : public std::unary_function<Item*, bool> { bool operator()(const Item *item) const { -#ifdef TMWSERV_SUPPORT - return item && item->getId() && item->getQuantity(); -#else - return item && item->getId() != -1 && item->getQuantity() > 0; -#endif + return item && item->getId() >= 0 && item->getQuantity() > 0; } }; @@ -54,11 +50,7 @@ Inventory::~Inventory() Item *Inventory::getItem(int index) const { -#ifdef TMWSERV_SUPPORT - if (index < 0 || index >= mSize) -#else if (index < 0 || index >= mSize || !mItems[index] || mItems[index]->getQuantity() <= 0) -#endif return 0; return mItems[index]; |