Made the different hard-coded paths and files be now taken from the

data/paths.xml configuration file.

Also added default gui theme path in branding and default wallpaper path
and file searched respectively in the branding and paths.xml files.

Hard-coded values are still used as fallbacks.

Resolves: Manasource Mantis #148.

Reviewed-by: jaxad0127.

2 files changed, 6 insertions, 2 deletions

diff --git a/src/net/manaserv/beinghandler.cpp b/src/net/manaserv/beinghandler.cpp
index b08af749..8df9a8ab 100644
--- a/src/net/manaserv/beinghandler.cpp
+++ b/src/net/manaserv/beinghandler.cpp
@@ -232,7 +232,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 f6207800..2347fee2 100644
--- a/src/net/manaserv/playerhandler.cpp
+++ b/src/net/manaserv/playerhandler.cpp
@@ -29,6 +29,7 @@
 #include "log.h"
 #include "particle.h"
 #include "npc.h"
+#include "configuration.h"
 
 #include "gui/chat.h"
 #include "gui/gui.h"
@@ -141,7 +142,10 @@ void PlayerHandler::handleMessage(Net::MessageIn &msg)
             player_node->setLevel(msg.readInt16());
             player_node->setCharacterPoints(msg.readInt16());
             player_node->setCorrectionPoints(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;