Moved item icon from ItemInfo class to the Item class, so that it can be loaded

on demand. Results in faster startup time and reduced memory usage.

1 files changed, 11 insertions, 6 deletions

diff --git a/src/equipment.h b/src/equipment.h
index f820dcf0..7a0c8238 100644
--- a/src/equipment.h
+++ b/src/equipment.h
@@ -26,14 +26,20 @@
 
 #define EQUIPMENT_SIZE 11
 
+class Item;
+
 class Equipment
 {
     public:
         /**
          * Constructor.
          */
-        Equipment()
-        { clear(); }
+        Equipment();
+
+        /**
+         * Destructor.
+         */
+        ~Equipment();
 
         /**
          * Clears equipment.
@@ -43,17 +49,16 @@ class Equipment
         /**
          * Get equipment at the given slot.
          */
-        int getEquipment(int index)
+        Item* getEquipment(int index)
         { return mEquipment[index]; }
 
         /**
          * Set equipment at the given slot.
          */
-        void setEquipment(int index, int id)
-        { mEquipment[index] = id; }
+        void setEquipment(int index, int id);
 
     private:
-        int mEquipment[EQUIPMENT_SIZE];
+        Item* mEquipment[EQUIPMENT_SIZE];
 };
 
 #endif