diff options
| author | Przemysław Grzywacz <nexather@gmail.com> | 2013-05-24 18:55:53 +0200 |
|---|---|---|
| committer | Przemysław Grzywacz <nexather@gmail.com> | 2013-05-24 18:55:53 +0200 |
| commit | 05dc1666dc794ed6aa7f6568b768c652f8922c4e (patch) | |
| tree | af83e22418e912e8eb8b2bc6b9595da344f461c1 /src/net/tmwa/generalhandler.cpp | |
| parent | 703cd73c0baa82d5f8ae3a1b390401f17de32f7a (diff) | |
| parent | f9cd8a5d6b4460ffcb945979d1e8cd8ebadc9b8d (diff) | |
| download | mana-client-05dc1666dc794ed6aa7f6568b768c652f8922c4e.tar.gz mana-client-05dc1666dc794ed6aa7f6568b768c652f8922c4e.tar.bz2 mana-client-05dc1666dc794ed6aa7f6568b768c652f8922c4e.tar.xz mana-client-05dc1666dc794ed6aa7f6568b768c652f8922c4e.zip | |
Merge remote-tracking branch 'origin/master' into lpc2012 branch
Diffstat (limited to 'src/net/tmwa/generalhandler.cpp')
| -rw-r--r-- | src/net/tmwa/generalhandler.cpp | 14 |
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) { |