From bd1fdd87eed48ba3ffcc413936d6a6a60a429a97 Mon Sep 17 00:00:00 2001
From: Przemysław Grzywacz <nexather@gmail.com>
Date: Sat, 4 May 2013 21:57:58 +0200
Subject: Client-side settings are now available from settings.xml

---
 src/net/tmwa/generalhandler.cpp | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

(limited to 'src/net/tmwa/generalhandler.cpp')

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)
         {
-- 
cgit v1.2.3-60-g2f50