Ported a patch by Peavey on TMW to keep all item pointers inside of

inventory. For us, this should get rid of the arrow crashing bug, if it 
still exists (been a few weeks since I've heard of it happening now).

1 files changed, 4 insertions, 4 deletions

diff --git a/src/net/equipmenthandler.cpp b/src/net/equipmenthandler.cpp
index b5c9fe2b..5464fa55 100644
--- a/src/net/equipmenthandler.cpp
+++ b/src/net/equipmenthandler.cpp
@@ -87,7 +87,7 @@ void EquipmentHandler::handleMessage(MessageIn *msg)
                         position++;
                     }
                     item = inventory->getItem(index);
-                    player_node->mEquipment->setEquipment(position, item);
+                    player_node->mEquipment->setEquipment(position, index);
                 }
             }
             break;
@@ -120,7 +120,7 @@ void EquipmentHandler::handleMessage(MessageIn *msg)
                 position++;
             }
             logger->log("Position %i", position);
-            item = 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) {
@@ -128,7 +128,7 @@ void EquipmentHandler::handleMessage(MessageIn *msg)
             }
 
             item = inventory->getItem(index);
-            player_node->mEquipment->setEquipment(position, item);
+            player_node->mEquipment->setEquipment(position, index);
             break;
 
         case SMSG_PLAYER_UNEQUIP:
@@ -181,7 +181,7 @@ void EquipmentHandler::handleMessage(MessageIn *msg)
             item = inventory->getItem(index);
             if (item) {
                 item->setEquipped(true);
-                player_node->mEquipment->setArrows(item);
+                player_node->mEquipment->setArrows(index);
                 logger->log("Arrows equipped: %i", index);
             }
             break;