summaryrefslogtreecommitdiff
path: root/src/net/tmwa/generalhandler.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/net/tmwa/generalhandler.cpp')
-rw-r--r--src/net/tmwa/generalhandler.cpp51
1 files changed, 3 insertions, 48 deletions
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index 8c173f248..4f03f490e 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -32,6 +32,8 @@
#include "gui/widgets/tabs/chat/guildtab.h"
#include "gui/widgets/tabs/chat/partytab.h"
+#include "net/tmwa/generalrecv.h"
+
#include "net/tmwa/adminhandler.h"
#include "net/tmwa/beinghandler.h"
#include "net/tmwa/buysellhandler.h"
@@ -84,9 +86,6 @@ extern Net::GeneralHandler *generalHandler;
namespace TmwAthena
{
-ServerInfo charServer;
-ServerInfo mapServer;
-
GeneralHandler::GeneralHandler() :
MessageHandler(),
mAdminHandler(new AdminHandler),
@@ -165,7 +164,7 @@ void GeneralHandler::handleMessage(Net::MessageIn &msg)
switch (msg.getId())
{
case SMSG_CONNECTION_PROBLEM:
- processConnectionProblem(msg);
+ GeneralRecv::processConnectionProblem(msg);
break;
default:
@@ -174,50 +173,6 @@ void GeneralHandler::handleMessage(Net::MessageIn &msg)
BLOCK_END("GeneralHandler::handleMessage")
}
-void GeneralHandler::processConnectionProblem(Net::MessageIn &msg)
-{
- const uint8_t code = msg.readUInt8("flag");
- logger->log("Connection problem: %u", static_cast<unsigned int>(code));
-
- switch (code)
- {
- case 0:
- // TRANSLATORS: error message
- errorMessage = _("Authentication failed.");
- break;
- case 1:
- // TRANSLATORS: error message
- errorMessage = _("No servers available.");
- break;
- case 2:
- if (client->getState() == STATE_GAME)
- {
- // TRANSLATORS: error message
- errorMessage = _("Someone else is trying to use this "
- "account.");
- }
- else
- {
- // TRANSLATORS: error message
- errorMessage = _("This account is already logged in.");
- }
- break;
- case 3:
- // TRANSLATORS: error message
- errorMessage = _("Speed hack detected.");
- break;
- case 8:
- // TRANSLATORS: error message
- errorMessage = _("Duplicated login.");
- break;
- default:
- // TRANSLATORS: error message
- errorMessage = _("Unknown connection error.");
- break;
- }
- client->setState(STATE_ERROR);
-}
-
void GeneralHandler::load()
{
(new Network)->registerHandler(this);