From 8c3ddf08fa76b5e39c1e3854a1c5fb06029772a2 Mon Sep 17 00:00:00 2001 From: Dennis Friis Date: Fri, 25 Apr 2008 23:55:51 +0000 Subject: Avoid stacking equipment other than arrows. Based on similar fix in inventoryhandler. --- ChangeLog | 5 +++++ src/inventory.cpp | 8 +++++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index a95d377e..6cfedec6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-04-26 Dennis Friis + + * src/inventory.cpp: Avoid stacking equipment other than arrows. Based on + similar fix in inventoryhandler. + 2008-04-24 Dennis Friis * src/itemshortcut.h, src/gui/itemshortcutcontainer.cpp, diff --git a/src/inventory.cpp b/src/inventory.cpp index 6795fbec..be002dfe 100644 --- a/src/inventory.cpp +++ b/src/inventory.cpp @@ -72,7 +72,13 @@ void Inventory::addItem(int index, int id, int quantity, bool equipment) } mItems[index].setId(id); - mItems[index].increaseQuantity(quantity); + + // Dont stack equipment other than arrows. + if (equipment && !(id == 1199 || id == 529)) + mItems[index].setQuantity(quantity); + else + mItems[index].increaseQuantity(quantity); + mItems[index].setEquipment(equipment); } -- cgit v1.2.3-70-g09d2