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

1 files changed, 4 insertions, 0 deletions

diff --git a/src/client.cpp b/src/client.cpp
index fac3c5b7..b64f9a89 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -112,6 +112,7 @@ LoginData loginData;
 
 Configuration config;         /**< XML file configuration reader */
 Configuration branding;       /**< XML branding information reader */
+Configuration paths;          /**< XML default paths information reader */
 Logger *logger;               /**< Log object */
 ChatLogger *chatLogger;       /**< Chat log object */
 KeyboardConfig keyboard;
@@ -746,6 +747,9 @@ int Client::exec()
                             false);
                     }
 
+                    // Read default paths file 'data/paths.xml'
+                    paths.init("paths.xml", true);
+
                     // Load XML databases
                     ColorDB::load();
                     ItemDB::load();