summaryrefslogtreecommitdiff
path: root/src/net/tmwa
diff options
context:
space:
mode:
Diffstat (limited to 'src/net/tmwa')
-rw-r--r--src/net/tmwa/gamehandler.cpp43
-rw-r--r--src/net/tmwa/gamehandler.h3
-rw-r--r--src/net/tmwa/gamerecv.cpp66
-rw-r--r--src/net/tmwa/gamerecv.h38
4 files changed, 114 insertions, 36 deletions
diff --git a/src/net/tmwa/gamehandler.cpp b/src/net/tmwa/gamehandler.cpp
index 75fffc77a..fee70405b 100644
--- a/src/net/tmwa/gamehandler.cpp
+++ b/src/net/tmwa/gamehandler.cpp
@@ -29,6 +29,9 @@
#include "net/ea/token.h"
+#include "net/ea/gamerecv.h"
+
+#include "net/tmwa/gamerecv.h"
#include "net/tmwa/loginhandler.h"
#include "net/tmwa/messageout.h"
#include "net/tmwa/network.h"
@@ -66,7 +69,7 @@ void GameHandler::handleMessage(Net::MessageIn &msg)
switch (msg.getId())
{
case SMSG_MAP_LOGIN_SUCCESS:
- processMapLogin(msg);
+ GameRecv::processMapLogin(msg);
break;
case SMSG_SERVER_PING:
@@ -75,15 +78,15 @@ void GameHandler::handleMessage(Net::MessageIn &msg)
break;
case SMSG_WHO_ANSWER:
- processWhoAnswer(msg);
+ Ea::GameRecv::processWhoAnswer(msg);
break;
case SMSG_CHAR_SWITCH_RESPONSE:
- processCharSwitchResponse(msg);
+ Ea::GameRecv::processCharSwitchResponse(msg);
break;
case SMSG_MAP_QUIT_RESPONSE:
- processMapQuitResponse(msg);
+ Ea::GameRecv::processMapQuitResponse(msg);
break;
default:
@@ -111,19 +114,19 @@ void GameHandler::connect()
// Change the player's ID to the account ID to match what eAthena uses
if (localPlayer)
{
- mCharID = localPlayer->getId();
+ Ea::GameRecv::mCharID = localPlayer->getId();
localPlayer->setId(token.account_ID);
}
else
{
- mCharID = BeingId_zero;
+ Ea::GameRecv::mCharID = BeingId_zero;
}
}
// Send login infos
createOutPacket(CMSG_MAP_SERVER_CONNECT);
outMsg.writeBeingId(token.account_ID, "account id");
- outMsg.writeBeingId(mCharID, "char id");
+ outMsg.writeBeingId(Ea::GameRecv::mCharID, "char id");
outMsg.writeInt32(token.session_ID1, "session id1");
outMsg.writeInt32(token.session_ID2, "session id2");
outMsg.writeInt8(Being::genderToInt(token.sex), "gender");
@@ -171,30 +174,4 @@ void GameHandler::disconnect2() const
createOutPacket(CMSG_CLIENT_DISCONNECT);
}
-void GameHandler::processMapLogin(Net::MessageIn &msg)
-{
- unsigned char direction;
- uint16_t x, y;
- msg.readInt32("tick");
- msg.readCoordinates(x, y, direction, "position");
- msg.readInt16("unknown?");
- logger->log("Protocol: Player start position: (%d, %d),"
- " Direction: %d", x, y, direction);
-
- mLastHost &= 0xffffff;
-
- GameHandler *const g = static_cast<GameHandler*>(gameHandler);
- if (g)
- {
- Network *const network = g->mNetwork;
- if (network)
- network->pauseDispatch();
- }
-
- // Switch now or we'll have problems
- client->setState(STATE_GAME);
- if (localPlayer)
- localPlayer->setTileCoords(x, y);
-}
-
} // namespace TmwAthena
diff --git a/src/net/tmwa/gamehandler.h b/src/net/tmwa/gamehandler.h
index fd451928b..9af5d017f 100644
--- a/src/net/tmwa/gamehandler.h
+++ b/src/net/tmwa/gamehandler.h
@@ -55,9 +55,6 @@ class GameHandler final : public MessageHandler, public Ea::GameHandler
bool mustPing() const override final A_WARN_UNUSED
{ return false; }
-
- protected:
- static void processMapLogin(Net::MessageIn &msg);
};
} // namespace TmwAthena
diff --git a/src/net/tmwa/gamerecv.cpp b/src/net/tmwa/gamerecv.cpp
new file mode 100644
index 000000000..b7cf5175c
--- /dev/null
+++ b/src/net/tmwa/gamerecv.cpp
@@ -0,0 +1,66 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2009 The Mana World Development Team
+ * Copyright (C) 2009-2010 The Mana Developers
+ * Copyright (C) 2011-2015 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include "net/tmwa/gamerecv.h"
+
+#include "client.h"
+#include "logger.h"
+
+#include "being/localplayer.h"
+
+#include "net/ea/token.h"
+
+#include "net/tmwa/loginhandler.h"
+#include "net/tmwa/messageout.h"
+#include "net/tmwa/network.h"
+#include "net/tmwa/protocol.h"
+
+#include "debug.h"
+
+namespace TmwAthena
+{
+
+extern ServerInfo mapServer;
+
+void GameRecv::processMapLogin(Net::MessageIn &msg)
+{
+ unsigned char direction;
+ uint16_t x, y;
+ msg.readInt32("tick");
+ msg.readCoordinates(x, y, direction, "position");
+ msg.readInt16("unknown?");
+ logger->log("Protocol: Player start position: (%d, %d),"
+ " Direction: %d", x, y, direction);
+
+ mLastHost &= 0xffffff;
+
+ Network *const network = Network::mInstance;
+ if (network)
+ network->pauseDispatch();
+
+ // Switch now or we'll have problems
+ client->setState(STATE_GAME);
+ if (localPlayer)
+ localPlayer->setTileCoords(x, y);
+}
+
+} // namespace TmwAthena
diff --git a/src/net/tmwa/gamerecv.h b/src/net/tmwa/gamerecv.h
new file mode 100644
index 000000000..75af0b232
--- /dev/null
+++ b/src/net/tmwa/gamerecv.h
@@ -0,0 +1,38 @@
+/*
+ * The ManaPlus Client
+ * Copyright (C) 2009 The Mana World Development Team
+ * Copyright (C) 2009-2010 The Mana Developers
+ * Copyright (C) 2011-2015 The ManaPlus Developers
+ *
+ * This file is part of The ManaPlus Client.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#ifndef NET_TMWA_GAMERECV_H
+#define NET_TMWA_GAMERECV_H
+
+#include "net/tmwa/messagehandler.h"
+
+#include "net/ea/gamehandler.h"
+
+namespace TmwAthena
+{
+ namespace GameRecv
+ {
+ void processMapLogin(Net::MessageIn &msg);
+ } // namespace GameRecv
+} // namespace TmwAthena
+
+#endif // NET_TMWA_GAMERECV_H