diff options
| -rw-r--r-- | src/client.cpp | 2 | ||||
| -rw-r--r-- | src/net/manaserv/generalhandler.cpp | 15 |
2 files changed, 11 insertions, 6 deletions
diff --git a/src/client.cpp b/src/client.cpp index 6ed208c0..7ec5a155 100644 --- a/src/client.cpp +++ b/src/client.cpp @@ -747,6 +747,8 @@ int Client::exec() paths.init("paths.xml", true); paths.setDefaultValues(getPathsDefaults()); + Mana::Event::trigger("Client", "DBsLoading"); + // Load XML databases ColorDB::load(); itemDb = new ItemDB; diff --git a/src/net/manaserv/generalhandler.cpp b/src/net/manaserv/generalhandler.cpp index f4982173..2858d16f 100644 --- a/src/net/manaserv/generalhandler.cpp +++ b/src/net/manaserv/generalhandler.cpp @@ -176,14 +176,17 @@ void GeneralHandler::event(const std::string &channel, { if (channel == "Client") { - int newState = event.getInt("newState"); - - if (newState == STATE_GAME) + if (event.getName() == "StatChange") { - GameHandler *game = static_cast<GameHandler*>(Net::getGameHandler()); - game->gameLoading(); + int newState = event.getInt("newState"); + + if (newState == STATE_GAME) + { + GameHandler *game = static_cast<GameHandler*>(Net::getGameHandler()); + game->gameLoading(); + } } - else if (newState == STATE_LOAD_DATA) + else if (event.getName() == "DBsLoading") { Attributes::load(); Attributes::informItemDB(); |