From ad4b0d0b8e32e61798ade9c256f850e8f96575f3 Mon Sep 17 00:00:00 2001
From: Ira Rice <irarice@gmail.com>
Date: Wed, 1 Oct 2008 18:04:15 +0000
Subject: Possible fix for the arrow crashing bug. Confirmation needed.

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

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

diff --git a/src/net/equipmenthandler.cpp b/src/net/equipmenthandler.cpp
index 0fc98175..b5c9fe2b 100644
--- a/src/net/equipmenthandler.cpp
+++ b/src/net/equipmenthandler.cpp
@@ -146,22 +146,22 @@ void EquipmentHandler::handleMessage(MessageIn *msg)
                 break;
             }
 
-            if (equipPoint & 0x8000) {    // Arrows
-                player_node->mEquipment->setArrows(NULL);
-                position = 11;
-            } else {
-                mask = 1;
-                position = 0;
-                while (!(equipPoint & mask)) {
-                    mask <<= 1;
-                    position++;
-                }
+            mask = 1;
+            position = 0;
+            while (!(equipPoint & mask)) {
+                mask <<= 1;
+                position++;
+            }
 
-                item = inventory->getItem(index);
-                if (!item)
-                    break;
+            item = inventory->getItem(index);
+            if (!item)
+                break;
 
-                item->setEquipped(false);
+            item->setEquipped(false);
+            if (equipPoint & 0x8000) {    // Arrows
+                player_node->mEquipment->setArrows(NULL);
+            }
+            else {
                 player_node->mEquipment->removeEquipment(position);
             }
             logger->log("Unequipping: %i %i(%i) %i",
-- 
cgit v1.2.3-70-g09d2