summaryrefslogtreecommitdiff
path: root/src/net/ea/inventoryhandler.cpp
diff options
context:
space:
mode:
authorBlue <bluesansdouze@gmail.com>2009-05-12 20:46:56 +0200
committerBlue <bluesansdouze@gmail.com>2009-05-12 20:46:56 +0200
commit9071a692116745f2cafd8556cbff28095910730e (patch)
tree6fbc96a1cb00558c4015d1eff25f45b2c6ccdcb8 /src/net/ea/inventoryhandler.cpp
parent2e94f4e92821bad6ebb328d00b2bd918c4b1b99e (diff)
parent0257eaf4d3945eac7cb3e50ccf8dfef18fa29698 (diff)
downloadmana-client-9071a692116745f2cafd8556cbff28095910730e.tar.gz
mana-client-9071a692116745f2cafd8556cbff28095910730e.tar.bz2
mana-client-9071a692116745f2cafd8556cbff28095910730e.tar.xz
mana-client-9071a692116745f2cafd8556cbff28095910730e.zip
Merge branch 'master' of git@gitorious.org:tmw/mainline
Diffstat (limited to 'src/net/ea/inventoryhandler.cpp')
-rw-r--r--src/net/ea/inventoryhandler.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp
index 1c48aa6c..30c583b8 100644
--- a/src/net/ea/inventoryhandler.cpp
+++ b/src/net/ea/inventoryhandler.cpp
@@ -27,6 +27,7 @@
#include "net/messageout.h"
#include "configuration.h"
+#include "equipment.h"
#include "inventory.h"
#include "item.h"
#include "itemshortcut.h"
@@ -318,6 +319,9 @@ void InventoryHandler::unequipItem(const Item *item)
MessageOut outMsg(CMSG_PLAYER_UNEQUIP);
outMsg.writeInt16(item->getInvIndex() + INVENTORY_OFFSET);
+
+ // Tidy equipment directly to avoid weapon still shown bug, for instance
+ player_node->mEquipment->removeEquipment(item->getInvIndex());
}
void InventoryHandler::useItem(const Item *item)