diff options
author | Jared Adams <jaxad0127@gmail.com> | 2009-05-07 07:51:35 -0600 |
---|---|---|
committer | Jared Adams <jaxad0127@gmail.com> | 2009-05-07 07:52:38 -0600 |
commit | b6580a8e547732ec1194afe218c030b8230659e2 (patch) | |
tree | a1c2ae8454db1f91274c5c13e3d67d81343532c4 /src/net/ea | |
parent | 67f53660db85c2f325472701517e04c446ec8ed4 (diff) | |
download | mana-client-b6580a8e547732ec1194afe218c030b8230659e2.tar.gz mana-client-b6580a8e547732ec1194afe218c030b8230659e2.tar.bz2 mana-client-b6580a8e547732ec1194afe218c030b8230659e2.tar.xz mana-client-b6580a8e547732ec1194afe218c030b8230659e2.zip |
Fix handling of error messages in the game state
Also make sure an appropirate message gets shown on duplicated login.
Diffstat (limited to 'src/net/ea')
-rw-r--r-- | src/net/ea/generalhandler.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/net/ea/generalhandler.cpp b/src/net/ea/generalhandler.cpp index 3d1b4536..b8d75671 100644 --- a/src/net/ea/generalhandler.cpp +++ b/src/net/ea/generalhandler.cpp @@ -128,7 +128,11 @@ void GeneralHandler::handleMessage(MessageIn &msg) errorMessage = _("No servers available"); break; case 2: - errorMessage = _("This account is already logged in"); + if (state == STATE_GAME) + errorMessage = _("Someone else is trying to use this " + "account"); + else + errorMessage = _("This account is already logged in"); break; case 3: errorMessage = _("Speed hack detected"); @@ -191,12 +195,12 @@ void GeneralHandler::tick() if (mNetwork->getState() == Network::NET_ERROR) { - state = STATE_ERROR; - if (!mNetwork->getError().empty()) errorMessage = mNetwork->getError(); else errorMessage = _("Got disconnected from server!"); + + state = STATE_ERROR; } } |