Have equipment tied into player inventory instead of keeping its own list of pointers to items. This ensures the ressource is up-to-date and avoids crashes on stale item pointers.

1 files changed, 2 insertions, 0 deletions

diff --git a/src/gui/equipmentwindow.h b/src/gui/equipmentwindow.h
index 99a3cc60..c853a039 100644
--- a/src/gui/equipmentwindow.h
+++ b/src/gui/equipmentwindow.h
@@ -25,6 +25,7 @@
 #define _TMW_EQUIPMENT_H
 
 #include "window.h"
+#include "../inventory.h"
 
 class Equipment;
 
@@ -53,6 +54,7 @@ class EquipmentWindow : public Window
 
     private:
         Equipment *mEquipment;
+        Inventory *inventory;
 };
 
 extern EquipmentWindow *equipmentWindow;