From 489a429bea6739dfa25503b9329bd9e33bffb856 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Thu, 25 Sep 2008 00:15:44 +0000
Subject: Merged the Tametomo branch into trunk.

---
 src/net/equipmenthandler.cpp | 7 +++++++
 1 file changed, 7 insertions(+)

(limited to 'src/net/equipmenthandler.cpp')

diff --git a/src/net/equipmenthandler.cpp b/src/net/equipmenthandler.cpp
index cc5d016c..0fc98175 100644
--- a/src/net/equipmenthandler.cpp
+++ b/src/net/equipmenthandler.cpp
@@ -156,6 +156,12 @@ void EquipmentHandler::handleMessage(MessageIn *msg)
                     mask <<= 1;
                     position++;
                 }
+
+                item = inventory->getItem(index);
+                if (!item)
+                    break;
+
+                item->setEquipped(false);
                 player_node->mEquipment->removeEquipment(position);
             }
             logger->log("Unequipping: %i %i(%i) %i",
@@ -174,6 +180,7 @@ void EquipmentHandler::handleMessage(MessageIn *msg)
 
             item = inventory->getItem(index);
             if (item) {
+                item->setEquipped(true);
                 player_node->mEquipment->setArrows(item);
                 logger->log("Arrows equipped: %i", index);
             }
-- 
cgit v1.2.3-70-g09d2