* 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, 3 insertions, 10 deletions

diff --git a/src/floor_item.cpp b/src/floor_item.cpp
index a1b83a75..32b8aee5 100755
--- a/src/floor_item.cpp
+++ b/src/floor_item.cpp
@@ -46,23 +46,16 @@ FloorItem::FloorItem(unsigned int id,
     mMap(map)
 {
     // Retrieve item image using a global itemset and itemDb (alternative?)
-    Image *image = itemset->spriteset[
-        itemDb->getItemInfo(itemId)->getImage() - 1];
+    mImage = itemset->spriteset[itemDb->getItemInfo(itemId)->getImage() - 1];
 
-    // Create the sprite representing this floor item
-    mSprite = new Sprite(mX * map->getTileWidth(),
-                         mY * map->getTileHeight(),
-                         image);
-
-    // Add the representative sprite to the map
-    mSpriteIterator = mMap->addSprite(mSprite);
+    // Add ourselves to the map
+    mSpriteIterator = mMap->addSprite(this);
 }
 
 FloorItem::~FloorItem()
 {
     // Remove and delete the representative sprite
     mMap->removeSprite(mSpriteIterator);
-    delete mSprite;
 }
 
 void empty_floor_items()