diff options
| author | Andrei Karas <akaras@inbox.ru> | 2011-10-17 22:07:24 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2011-10-17 22:07:24 +0300 |
| commit | d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a (patch) | |
| tree | 5f128768c66436eefd70632f02889607596609d4 /src/net/tmwa/generalhandler.cpp | |
| parent | f1e92aca00a4859047e83fab76220767b9a2f814 (diff) | |
| parent | e93e6beb456d105987da3190c2a80847b6900081 (diff) | |
| download | manaplus-d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a.tar.gz manaplus-d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a.tar.bz2 manaplus-d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a.tar.xz manaplus-d14bb7a27ee23cc83b3af1db2f1976eaaa55d78a.zip | |
Merge branch 'master' into strippedstripped1.1.10.16
Conflicts:
data/fonts/mplus-1p-bold.ttf
data/fonts/mplus-1p-regular.ttf
Diffstat (limited to 'src/net/tmwa/generalhandler.cpp')
| -rw-r--r-- | src/net/tmwa/generalhandler.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp index c6ebc000c..0a9541477 100644 --- a/src/net/tmwa/generalhandler.cpp +++ b/src/net/tmwa/generalhandler.cpp @@ -143,10 +143,14 @@ void GeneralHandler::handleMessage(Net::MessageIn &msg) break; case 2: if (Client::getState() == 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."); |