1 files changed, 18 insertions, 26 deletions

diff --git a/src/net/equipmenthandler.cpp b/src/net/equipmenthandler.cpp
index e5bbf6fe..973de0f6 100644
--- a/src/net/equipmenthandler.cpp
+++ b/src/net/equipmenthandler.cpp
@@ -20,7 +20,6 @@
  */
 
 #include "equipmenthandler.h"
-
 #include "messagein.h"
 #include "protocol.h"
 
@@ -107,7 +106,10 @@ void EquipmentHandler::handleMessage(MessageIn *msg)
                 break;
             }
 
-            // Unequip any existing equipped item in this position
+            /*
+             * An item may occupy more than 1 slot.  If so, it's
+             * only shown as equipped on the *first* slot.
+             */
             mask = 1;
             position = 0;
             while (!(equipPoint & mask)) {
@@ -115,7 +117,10 @@ void EquipmentHandler::handleMessage(MessageIn *msg)
                 position++;
             }
             logger->log("Position %i", position);
-            item =  player_node->getInventory()->getItem(player_node->mEquipment->getEquipment(position));
+
+            item = player_node->getInventory()->getItem(player_node->mEquipment->getEquipment(position));
+
+            // Unequip any existing equipped item in this position
             if (item) {
                 item->setEquipped(false);
             }
@@ -152,24 +157,11 @@ void EquipmentHandler::handleMessage(MessageIn *msg)
 
             item->setEquipped(false);
 
-            switch (item->getId()) {
-                case 529:
-                case 1199:
-                    player_node->mEquipment->setArrows(0);
-                    break;
-                case 521:
-                case 522:
-                case 530:
-                case 536:
-                case 1200:
-                case 1201:
-                    player_node->setSprite(Being::WEAPON_SPRITE, 0);
-                    // TODO: Why this break? Shouldn't a weapon be
-                    //       unequipped in inventory too?
-                    break;
-                default:
-                    player_node->mEquipment->removeEquipment(position);
-                    break;
+            if (equipPoint & 0x8000) {    // Arrows
+                player_node->mEquipment->setArrows(0);
+            }
+            else {
+                player_node->mEquipment->removeEquipment(position);
             }
             logger->log("Unequipping: %i %i(%i) %i",
                     index, equipPoint, type, position);
@@ -186,12 +178,12 @@ void EquipmentHandler::handleMessage(MessageIn *msg)
                 break;
 
             item = inventory->getItem(index);
-            if (!item)
-                break;
 
-            item->setEquipped(true);
-            player_node->mEquipment->setArrows(index);
-            logger->log("Arrows equipped: %i", index);
+            if (item) {
+                item->setEquipped(true);
+                player_node->mEquipment->setArrows(index);
+                logger->log("Arrows equipped: %i", index);
+            }
             break;
     }
 }