Merge branch 'master' of gitorious.org:manaplus/manaplus

22 files changed, 24 insertions, 23 deletions

diff --git a/src/resources/animation.cpp b/src/resources/animation.cpp
index ea7f44199..32b57b3b1 100644
--- a/src/resources/animation.cpp
+++ b/src/resources/animation.cpp
@@ -22,7 +22,7 @@
 
 #include "resources/animation.h"
 
-#include "log.h"
+#include "logger.h"
 
 #include "utils/dtor.h"
 
diff --git a/src/resources/beinginfo.cpp b/src/resources/beinginfo.cpp
index 6b4f57d81..8beea420d 100644
--- a/src/resources/beinginfo.cpp
+++ b/src/resources/beinginfo.cpp
@@ -22,7 +22,7 @@
 
 #include "resources/beinginfo.h"
 
-#include "log.h"
+#include "logger.h"
 
 #include "utils/dtor.h"
 #include "utils/gettext.h"
diff --git a/src/resources/colordb.cpp b/src/resources/colordb.cpp
index 72a5e4023..ed8c934dc 100644
--- a/src/resources/colordb.cpp
+++ b/src/resources/colordb.cpp
@@ -21,7 +21,7 @@
 #include "resources/colordb.h"
 
 #include "client.h"
-#include "log.h"
+#include "logger.h"
 
 #include "utils/xml.h"
 
diff --git a/src/resources/dye.cpp b/src/resources/dye.cpp
index fe7d4bcac..a782b6ec1 100644
--- a/src/resources/dye.cpp
+++ b/src/resources/dye.cpp
@@ -22,7 +22,7 @@
 
 #include "resources/dye.h"
 
-#include "log.h"
+#include "logger.h"
 
 #include <math.h>
 #include <sstream>
diff --git a/src/resources/emotedb.cpp b/src/resources/emotedb.cpp
index 85a2993dd..b7f7d7901 100644
--- a/src/resources/emotedb.cpp
+++ b/src/resources/emotedb.cpp
@@ -21,7 +21,7 @@
 #include "resources/emotedb.h"
 
 #include "animatedsprite.h"
-#include "log.h"
+#include "logger.h"
 
 #include "utils/xml.h"
 #include "configuration.h"
diff --git a/src/resources/image.cpp b/src/resources/image.cpp
index b1f83e258..802f2ee12 100644
--- a/src/resources/image.cpp
+++ b/src/resources/image.cpp
@@ -31,7 +31,7 @@
 #endif
 
 #include "client.h"
-#include "log.h"
+#include "logger.h"
 #include "main.h"
 
 #include "utils/stringutils.h"
diff --git a/src/resources/imageset.cpp b/src/resources/imageset.cpp
index 1d41c6e63..5cf3e7d82 100644
--- a/src/resources/imageset.cpp
+++ b/src/resources/imageset.cpp
@@ -22,7 +22,7 @@
 
 #include "resources/imageset.h"
 
-#include "log.h"
+#include "logger.h"
 
 #include "resources/image.h"
 
diff --git a/src/resources/imagewriter.cpp b/src/resources/imagewriter.cpp
index 5d0bd9d94..e6f3c8c27 100644
--- a/src/resources/imagewriter.cpp
+++ b/src/resources/imagewriter.cpp
@@ -22,7 +22,7 @@
 
 #include "resources/imagewriter.h"
 
-#include "log.h"
+#include "logger.h"
 
 #if defined __OpenBSD__
 #include <libpng/png.h>
diff --git a/src/resources/itemdb.cpp b/src/resources/itemdb.cpp
index 2d14ba687..e60127997 100644
--- a/src/resources/itemdb.cpp
+++ b/src/resources/itemdb.cpp
@@ -23,7 +23,7 @@
 #include "resources/itemdb.h"
 
 #include "client.h"
-#include "log.h"
+#include "logger.h"
 
 #include "resources/iteminfo.h"
 #include "resources/resourcemanager.h"
@@ -213,7 +213,7 @@ void ItemDB::load()
         std::string attackAction = XML::getProperty(node, "attack-action", "");
         std::string drawBefore = XML::getProperty(node, "drawBefore", "");
         std::string drawAfter = XML::getProperty(node, "drawAfter", "");
-        std::string removeSprite = XML::getProperty(node, "removeSprite", "");
+//        std::string removeSprite = XML::getProperty(node, "removeSprite", "");
         std::string colors;
         if (serverVersion >= 1)
             colors = XML::getProperty(node, "colors", "");
diff --git a/src/resources/iteminfo.cpp b/src/resources/iteminfo.cpp
index 6658236f3..56cfc01f6 100644
--- a/src/resources/iteminfo.cpp
+++ b/src/resources/iteminfo.cpp
@@ -32,7 +32,7 @@
 
 #include "debug.h"
 
-
+/*
 ItemInfo::ItemInfo(ItemInfo &info)
 {
     mMissileParticleFile = info.mMissileParticleFile;
@@ -61,6 +61,7 @@ ItemInfo::ItemInfo(ItemInfo &info)
         mDrawPriority[f] = info.mDrawPriority[f];
     }
 }
+*/
 
 ItemInfo::ItemInfo() :
     mMissileParticleFile(""),
diff --git a/src/resources/iteminfo.h b/src/resources/iteminfo.h
index daa9d590c..1fe8f3bad 100644
--- a/src/resources/iteminfo.h
+++ b/src/resources/iteminfo.h
@@ -107,7 +107,7 @@ class ItemInfo
          */
         ItemInfo();
 
-        ItemInfo(ItemInfo &info);
+//        ItemInfo(ItemInfo &info);
 
         ~ItemInfo();
 
diff --git a/src/resources/mapdb.cpp b/src/resources/mapdb.cpp
index e8aeaf168..e7288e039 100644
--- a/src/resources/mapdb.cpp
+++ b/src/resources/mapdb.cpp
@@ -23,7 +23,7 @@
 
 #include "configuration.h"
 #include "client.h"
-#include "log.h"
+#include "logger.h"
 
 #include "utils/xml.h"
 
diff --git a/src/resources/mapreader.cpp b/src/resources/mapreader.cpp
index 35267533f..70c45054f 100644
--- a/src/resources/mapreader.cpp
+++ b/src/resources/mapreader.cpp
@@ -23,7 +23,7 @@
 #include "resources/mapreader.h"
 
 #include "configuration.h"
-#include "log.h"
+#include "logger.h"
 #include "map.h"
 #include "tileset.h"
 
diff --git a/src/resources/monsterdb.cpp b/src/resources/monsterdb.cpp
index 7a0494fc9..dbf9d3e9a 100644
--- a/src/resources/monsterdb.cpp
+++ b/src/resources/monsterdb.cpp
@@ -22,7 +22,7 @@
 
 #include "resources/monsterdb.h"
 
-#include "log.h"
+#include "logger.h"
 
 #include "net/net.h"
 
diff --git a/src/resources/music.cpp b/src/resources/music.cpp
index ccd1d9280..5ae9a2202 100644
--- a/src/resources/music.cpp
+++ b/src/resources/music.cpp
@@ -22,7 +22,7 @@
 
 #include "resources/music.h"
 
-#include "log.h"
+#include "logger.h"
 
 #include "debug.h"
 
diff --git a/src/resources/npcdb.cpp b/src/resources/npcdb.cpp
index 49eab5bf2..d04a2518f 100644
--- a/src/resources/npcdb.cpp
+++ b/src/resources/npcdb.cpp
@@ -22,7 +22,7 @@
 
 #include "resources/npcdb.h"
 
-#include "log.h"
+#include "logger.h"
 
 #include "resources/beinginfo.h"
 
diff --git a/src/resources/resource.cpp b/src/resources/resource.cpp
index 6e986272a..b180712c1 100644
--- a/src/resources/resource.cpp
+++ b/src/resources/resource.cpp
@@ -23,7 +23,7 @@
 #include "resources/resource.h"
 
 #include "client.h"
-#include "log.h"
+#include "logger.h"
 
 #include "resources/resourcemanager.h"
 
diff --git a/src/resources/resourcemanager.cpp b/src/resources/resourcemanager.cpp
index 92c18fa2a..ee325e253 100644
--- a/src/resources/resourcemanager.cpp
+++ b/src/resources/resourcemanager.cpp
@@ -24,7 +24,7 @@
 
 #include "client.h"
 #include "configuration.h"
-#include "log.h"
+#include "logger.h"
 #include "main.h"
 
 #include "resources/dye.h"
diff --git a/src/resources/soundeffect.cpp b/src/resources/soundeffect.cpp
index a01bf21a0..49e7adc31 100644
--- a/src/resources/soundeffect.cpp
+++ b/src/resources/soundeffect.cpp
@@ -22,7 +22,7 @@
 
 #include "resources/soundeffect.h"
 
-#include "log.h"
+#include "logger.h"
 
 #include "debug.h"
 
diff --git a/src/resources/specialdb.cpp b/src/resources/specialdb.cpp
index 4ab5e2a91..573ffb2a3 100644
--- a/src/resources/specialdb.cpp
+++ b/src/resources/specialdb.cpp
@@ -21,7 +21,7 @@
 
 #include "resources/specialdb.h"
 
-#include "log.h"
+#include "logger.h"
 
 #include "utils/dtor.h"
 #include "utils/xml.h"
diff --git a/src/resources/spritedef.cpp b/src/resources/spritedef.cpp
index b6addba77..dee93e1e7 100644
--- a/src/resources/spritedef.cpp
+++ b/src/resources/spritedef.cpp
@@ -22,7 +22,7 @@
 
 #include "resources/spritedef.h"
 
-#include "log.h"
+#include "logger.h"
 
 #include "resources/action.h"
 #include "resources/animation.h"
diff --git a/src/resources/wallpaper.cpp b/src/resources/wallpaper.cpp
index 397b87993..09c9f2a04 100644
--- a/src/resources/wallpaper.cpp
+++ b/src/resources/wallpaper.cpp
@@ -23,7 +23,7 @@
 #include "resources/wallpaper.h"
 
 #include "resources/resourcemanager.h"
-#include "log.h"
+#include "logger.h"
 
 #include "utils/stringutils.h"
 #include "configuration.h"