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, 9 insertions, 20 deletions

diff --git a/src/equipment.cpp b/src/equipment.cpp
index b2d5e609..984df74d 100644
--- a/src/equipment.cpp
+++ b/src/equipment.cpp
@@ -21,36 +21,25 @@
  *  $Id: equipment.cpp 4347 2008-06-12 09:06:01Z b_lindeijer $
  */
 
-#include "equipment.h"
-
 #include <algorithm>
 
+#include "equipment.h"
 #include "item.h"
-#include "item.h"
+#include "inventory.h"
+#include "localplayer.h"
 
 Equipment::Equipment():
     mArrows(0)
 {
-    std::fill_n(mEquipment, EQUIPMENT_SIZE, (Item*) 0);
+    std::fill_n(mEquipment, EQUIPMENT_SIZE, 0);
 }
 
 void
-Equipment::removeEquipment(Item *item)
+Equipment::setEquipment(int index, int inventoryIndex)
 {
-    Item **i = std::find(mEquipment, mEquipment + EQUIPMENT_SIZE, item);
-    if (i != mEquipment + EQUIPMENT_SIZE) {
-        *i = 0;
-    }
+    mEquipment[index] = inventoryIndex;
+    Item* item = player_node->getInventory()->getItem(inventoryIndex);
+    if (item)
+    	item->setEquipped(true);
 }
 
-void Equipment::removeEquipment(int index)
-{
-    if (index >= 0 && index < EQUIPMENT_SIZE)
-        mEquipment[index] = 0;
-}
-
-void Equipment::setEquipment(int index, Item *item)
-{
-    mEquipment[index] = item;
-    item->setEquipped(true);
-}