Merge branch 'testing'

Conflicts:
	src/account-server/storage.cpp
	src/game-server/being.cpp
	src/game-server/being.hpp
	src/game-server/character.cpp
	src/game-server/character.hpp
	src/game-server/gamehandler.cpp
	src/game-server/inventory.cpp
	src/scripting/lua.cpp
	src/sql/mysql/createTables.sql
	src/sql/sqlite/createTables.sql

1 files changed, 6 insertions, 4 deletions

diff --git a/src/account-server/main-account.cpp b/src/account-server/main-account.cpp
index 335a872a..9715ed5e 100644
--- a/src/account-server/main-account.cpp
+++ b/src/account-server/main-account.cpp
@@ -51,9 +51,10 @@
 using utils::Logger;
 
 // Default options that automake should be able to override.
-#define DEFAULT_LOG_FILE        "manaserv-account.log"
-#define DEFAULT_STATS_FILE      "manaserv.stats"
-#define DEFAULT_CONFIG_FILE     "manaserv.xml"
+#define DEFAULT_LOG_FILE          "manaserv-account.log"
+#define DEFAULT_STATS_FILE        "manaserv.stats"
+#define DEFAULT_CONFIG_FILE       "manaserv.xml"
+#define DEFAULT_ATTRIBUTEDB_FILE  "attributes.xml"
 
 static bool running = true;        /**< Determines if server keeps running */
 
@@ -307,7 +308,8 @@ int main(int argc, char *argv[])
     initialize();
 
     std::string host = Configuration::getValue("net_listenHost", std::string());
-    if (!AccountClientHandler::initialize(options.port, host) ||
+    if (!AccountClientHandler::initialize(DEFAULT_ATTRIBUTEDB_FILE,
+                                          options.port, host) ||
         !GameServerHandler::initialize(options.port + 1, host) ||
         !chatHandler->startListen(options.port + 2, host))
     {