diff options
| author | Brian <runningnak3d@gmail.com> | 2009-12-21 18:03:04 -0700 |
|---|---|---|
| committer | Brian <runningnak3d@gmail.com> | 2009-12-21 18:03:04 -0700 |
| commit | 76fb5ea713a5e224453763ee99cac79b4dcac4d8 (patch) | |
| tree | 8eb94d9205a412a125b4fb8bcc13e6f3e8ce65e8 | |
| parent | 35717d94db437c44ce62af9257cc4f3c12984106 (diff) | |
* Added back support for 1000 value to indicate unlimited stacking in
* item_template.stackable
* Removed pointless check for stackable limit at item_template load.
--HG--
branch : trunk
| -rw-r--r-- | src/game/ItemPrototype.h | 2 | ||||
| -rw-r--r-- | src/game/ObjectMgr.cpp | 5 |
2 files changed, 1 insertions, 6 deletions
diff --git a/src/game/ItemPrototype.h b/src/game/ItemPrototype.h index 51874be3787..34981d84a89 100644 --- a/src/game/ItemPrototype.h +++ b/src/game/ItemPrototype.h @@ -614,7 +614,7 @@ struct ItemPrototype uint32 GetMaxStackSize() const { - return (Stackable == 2147483647 || Stackable <= 0) ? uint32(0x7FFFFFFF-1) : uint32(Stackable); + return (Stackable == 2147483647 || Stackable <= 0 || Stackable == 1000) ? uint32(0x7FFFFFFF-1) : uint32(Stackable); } float getDPS() const diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp index d659561a889..2e36fb78ecd 100644 --- a/src/game/ObjectMgr.cpp +++ b/src/game/ObjectMgr.cpp @@ -2112,11 +2112,6 @@ void ObjectMgr::LoadItemPrototypes() sLog.outErrorDb("Item (Entry: %u) has too large negative in stackable (%i), replace by value (-1) no stacking limits.",i,proto->Stackable); const_cast<ItemPrototype*>(proto)->Stackable = -1; } - else if (proto->Stackable > 2147483647) - { - sLog.outErrorDb("Item (Entry: %u) has too large value in stackable (%u), replace by hardcoded upper limit (2147483647).",i,proto->Stackable); - const_cast<ItemPrototype*>(proto)->Stackable = 2147483647; - } if (proto->ContainerSlots > MAX_BAG_SIZE) { |