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, 5 insertions, 3 deletions

diff --git a/src/configuration.h b/src/configuration.h
index a0c896a5..908d13a4 100644
--- a/src/configuration.h
+++ b/src/configuration.h
@@ -197,9 +197,10 @@ class Configuration : public ConfigurationObject
         /**
          * Reads config file and parse all options into memory.
          *
-         * \param filename path to config file
+         * @param filename path to config file
+         * @param useResManager Make use of the resource manager.
          */
-        void init(const std::string &filename);
+        void init(const std::string &filename, bool useResManager = false);
 
         /**
          * Writes the current settings back to the config file.
@@ -244,10 +245,11 @@ class Configuration : public ConfigurationObject
         typedef ListenerMap::iterator ListenerMapIterator;
         ListenerMap mListenerMap;
 
-        std::string mConfigPath;         /**< Location of config file */
+        std::string mConfigPath;            /**< Location of config file */
 };
 
 extern Configuration branding;
 extern Configuration config;
+extern Configuration paths;
 
 #endif