Merge branch 'master' into strippedstripped1.1.9.4

Conflicts:
	data/fonts/mplus-1p-bold.ttf
	data/fonts/mplus-1p-regular.ttf
	src/guichan/basiccontainer.cpp
	src/guichan/include/guichan/basiccontainer.hpp
	src/guichan/widgets/window.cpp

1 files changed, 0 insertions, 19 deletions

diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp
index 56cfc01f6..fb4b8ed5e 100644
--- a/src/resources/iteminfo.cpp
+++ b/src/resources/iteminfo.cpp
@@ -144,25 +144,6 @@ const std::string &ItemInfo::getSound(EquipmentSoundEvent event) const
 
 std::map<int, int> *ItemInfo::addReplaceSprite(int sprite, int direction)
 {
-    if (direction == -1)
-    {
-        SpriteToItemMap *spMap = new SpriteToItemMap();
-        for (int f = 0; f < 9; f ++)
-        {
-            if (!mSpriteToItemReplaceMap[f])
-            {
-                mSpriteToItemReplaceMap[f] = spMap;
-                direction = f;
-            }
-        }
-        if (direction >= 0)
-            mSpriteToItemReplaceList.push_back(spMap);
-        else
-            delete spMap;
-        if (direction == -1)
-            direction = 1;
-    }
-
     if (direction < 0 || direction >= 9)
         return 0;