* Made Sprite into an interface implemented by both FloorItem and Being, which

  hook themselves into the map on construction. The improved fringe layer is
  working as expected now.
* Made sure TMW compiles without warnings even when using "-Wconversion
  -Wshadow -Wcast-qual -Wwrite-strings -ansi -pedantic", lots of cleanups.
* Added two new small tilesets that contain the desert tiles that are twice and
  three times the height of a normal tile. One well in new_3-1 has been
  converted to use the new double tiles for testing purposes.

1 files changed, 24 insertions, 3 deletions

diff --git a/src/equipment.cpp b/src/equipment.cpp
index 24c20ea4..85b5eda3 100644
--- a/src/equipment.cpp
+++ b/src/equipment.cpp
@@ -24,17 +24,38 @@
 #include "equipment.h"
 #include "item.h"
 
-Equipment *Equipment::instance = 0;
+Equipment *Equipment::mInstance = NULL;
 
 Equipment::Equipment():
-    arrows(0)
+    mArrows(NULL)
 {
     for (int i = 0; i < EQUIPMENT_SIZE; i++)
     {
-        equipment[i] = 0;
+        mEquipment[i] = NULL;
     }
 }
 
 Equipment::~Equipment()
 {
 }
+
+Equipment*
+Equipment::getInstance()
+{
+    if (!mInstance) {
+        mInstance = new Equipment();
+    }
+
+    return mInstance;
+}
+
+void
+Equipment::removeEquipment(Item *item)
+{
+    for (int i = 0; i < EQUIPMENT_SIZE; i++) {
+        if (mEquipment[i] == item) {
+            mEquipment[i] = 0;
+            break;
+        }
+    }
+}