summaryrefslogtreecommitdiff
path: root/src/net/tmwa/generalhandler.cpp
diff options
context:
space:
mode:
authorPrzemysław Grzywacz <nexather@gmail.com>2013-05-04 21:57:58 +0200
committerPrzemysław Grzywacz <nexather@gmail.com>2013-05-04 21:57:58 +0200
commitbd1fdd87eed48ba3ffcc413936d6a6a60a429a97 (patch)
tree159fcd36797021939967c770febd59d9fbe1ee19 /src/net/tmwa/generalhandler.cpp
parent0ef59afb6ee029a4e2247684f3f32f5bd064eb0b (diff)
downloadMana-bd1fdd87eed48ba3ffcc413936d6a6a60a429a97.tar.gz
Mana-bd1fdd87eed48ba3ffcc413936d6a6a60a429a97.tar.bz2
Mana-bd1fdd87eed48ba3ffcc413936d6a6a60a429a97.tar.xz
Mana-bd1fdd87eed48ba3ffcc413936d6a6a60a429a97.zip
Client-side settings are now available from settings.xml
Diffstat (limited to 'src/net/tmwa/generalhandler.cpp')
-rw-r--r--src/net/tmwa/generalhandler.cpp14
1 files changed, 1 insertions, 13 deletions
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)
{