Client-side settings are now available from settings.xml

2 files changed, 1 insertions, 23 deletions

diff --git a/src/net/manaserv/generalhandler.cpp b/src/net/manaserv/generalhandler.cpp
index c6b2af18..1e39410c 100644
--- a/src/net/manaserv/generalhandler.cpp
+++ b/src/net/manaserv/generalhandler.cpp
@@ -133,10 +133,6 @@ void GeneralHandler::reload()
     netToken.clear();
     gameServer.clear();
     chatServer.clear();
-
-    Attributes::unload();
-    Attributes::load();
-    Attributes::informItemDB();
 }
 
 void GeneralHandler::unload()
@@ -154,7 +150,6 @@ void GeneralHandler::unload()
     delete gameServerConnection;
     delete chatServerConnection;
 
-    Attributes::unload();
     finalize();
 }
 
@@ -190,11 +185,6 @@ void GeneralHandler::event(Event::Channel channel,
                 game->gameLoading();
             }
         }
-        else if (event.getType() == Event::LoadingDatabases)
-        {
-            Attributes::load();
-            Attributes::informItemDB();
-        }
     }
     else if (channel == Event::GameChannel)
     {
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index 0ce16691..5e445eaf 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -186,17 +186,12 @@ void GeneralHandler::reload()
     static_cast<LoginHandler*>(mLoginHandler.get())->clearWorlds();
     static_cast<CharServerHandler*>(mCharHandler.get())->setCharCreateDialog(0);
     static_cast<CharServerHandler*>(mCharHandler.get())->setCharSelectDialog(0);
-
-    Attributes::unload();
-    Attributes::load();
 }
 
 void GeneralHandler::unload()
 {
     if (mNetwork)
         mNetwork->clearHandlers();
-
-    Attributes::unload();
 }
 
 void GeneralHandler::flushNetwork()
@@ -226,14 +221,7 @@ void GeneralHandler::clearHandlers()
 void GeneralHandler::event(Event::Channel channel,
                            const Event &event)
 {
-    if (channel == Event::ClientChannel)
-    {
-        if (event.getType() == Event::LoadingDatabases)
-        {
-            Attributes::load();
-        }
-    }
-    else if (channel == Event::GameChannel)
+    if (channel == Event::GameChannel)
     {
         if (event.getType() == Event::GuiWindowsLoaded)
         {