Merge branch '1.0'

Conflicts:
	src/gui/itempopup.cpp
	src/item.cpp
	src/monster.cpp
	src/net/manaserv/playerhandler.cpp
	src/net/tmwa/partyhandler.cpp
	src/npc.cpp
	src/player.cpp
	src/resources/itemdb.cpp
	src/resources/monsterdb.cpp
	src/resources/monsterinfo.cpp
	src/resources/npcdb.cpp
	src/resources/spritedef.cpp

2 files changed, 6 insertions, 2 deletions

diff --git a/src/net/manaserv/beinghandler.cpp b/src/net/manaserv/beinghandler.cpp
index 57830680..f499ff0a 100644
--- a/src/net/manaserv/beinghandler.cpp
+++ b/src/net/manaserv/beinghandler.cpp
@@ -231,7 +231,7 @@ void BeingHandler::handleBeingsMoveMessage(Net::MessageIn &msg)
         }
         if (speed)
         {
-           /**
+           /*
             * The being's speed is transfered in tiles per second * 10
             * to keep it transferable in a Byte.
             * We set it back to tiles per second and in a float.
diff --git a/src/net/manaserv/playerhandler.cpp b/src/net/manaserv/playerhandler.cpp
index bc03cc25..fa823a11 100644
--- a/src/net/manaserv/playerhandler.cpp
+++ b/src/net/manaserv/playerhandler.cpp
@@ -29,6 +29,7 @@
 #include "log.h"
 #include "particle.h"
 #include "playerinfo.h"
+#include "configuration.h"
 
 #include "gui/chat.h"
 #include "gui/gui.h"
@@ -142,7 +143,10 @@ void PlayerHandler::handleMessage(Net::MessageIn &msg)
             PlayerInfo::setAttribute(LEVEL, msg.readInt16());
             PlayerInfo::setAttribute(CHAR_POINTS, msg.readInt16());
             PlayerInfo::setAttribute(CORR_POINTS, msg.readInt16());
-            Particle* effect = particleEngine->addEffect("graphics/particles/levelup.particle.xml", 0, 0);
+            Particle* effect = particleEngine->addEffect(
+                     paths.getValue("particles", "graphics/particles/")
+                   + paths.getValue("levelUpEffectFile", "levelup.particle.xml")
+                                                         ,0, 0);
             player_node->controlParticle(effect);
         } break;