summaryrefslogtreecommitdiff
path: root/src/net/eathena
diff options
context:
space:
mode:
Diffstat (limited to 'src/net/eathena')
-rw-r--r--src/net/eathena/gamehandler.cpp72
-rw-r--r--src/net/eathena/gamehandler.h9
-rw-r--r--src/net/eathena/gamerecv.cpp89
-rw-r--r--src/net/eathena/gamerecv.h41
4 files changed, 143 insertions, 68 deletions
diff --git a/src/net/eathena/gamehandler.cpp b/src/net/eathena/gamehandler.cpp
index ea8342ae3..2d4f7d20f 100644
--- a/src/net/eathena/gamehandler.cpp
+++ b/src/net/eathena/gamehandler.cpp
@@ -31,6 +31,9 @@
#include "net/ea/token.h"
+#include "net/ea/gamerecv.h"
+
+#include "net/eathena/gamerecv.h"
#include "net/eathena/loginhandler.h"
#include "net/eathena/messageout.h"
#include "net/eathena/network.h"
@@ -69,33 +72,31 @@ void GameHandler::handleMessage(Net::MessageIn &msg)
switch (msg.getId())
{
case SMSG_MAP_LOGIN_SUCCESS:
- processMapLogin(msg);
+ GameRecv::processMapLogin(msg);
break;
case SMSG_SERVER_PING:
- processServerTick(msg);
- // We ignore this for now
- // int tick = msg.readInt32()
+ GameRecv::processServerTick(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;
case SMSG_MAP_ACCOUNT_ID:
- processMapAccountId(msg);
+ GameRecv::processMapAccountId(msg);
break;
case SMSG_MAP_AUTH_REFUSE:
- processMapAuthRefuse(msg);
+ GameRecv::processMapAuthRefuse(msg);
break;
default:
@@ -123,19 +124,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 key1");
outMsg.writeInt32(0, "tick");
outMsg.writeInt8(Being::genderToInt(token.sex), "sex");
@@ -180,51 +181,4 @@ void GameHandler::disconnect2() const
{
}
-void GameHandler::processMapAccountId(Net::MessageIn &msg)
-{
- // ignored, because we already know local player account id.
- msg.readBeingId("account id");
-}
-
-void GameHandler::processMapLogin(Net::MessageIn &msg)
-{
- unsigned char direction;
- uint16_t x, y;
- msg.readInt32("start time");
- msg.readCoordinates(x, y, direction, "position");
- msg.readInt8("x size");
- msg.readInt8("y size");
- logger->log("Protocol: Player start position: "
- "(%d, %d), Direction: %d",
- x, y, direction);
- msg.readInt16("font");
- msg.readUInt8("sex");
-
- 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);
-}
-
-void GameHandler::processServerTick(Net::MessageIn &msg)
-{
- // ignoring
- msg.readInt32("tick");
-}
-
-void GameHandler::processMapAuthRefuse(Net::MessageIn &msg)
-{
- UNIMPLIMENTEDPACKET;
- msg.readUInt8("error");
-}
} // namespace EAthena
diff --git a/src/net/eathena/gamehandler.h b/src/net/eathena/gamehandler.h
index 695800407..b740ff299 100644
--- a/src/net/eathena/gamehandler.h
+++ b/src/net/eathena/gamehandler.h
@@ -55,15 +55,6 @@ class GameHandler final : public MessageHandler, public Ea::GameHandler
bool mustPing() const override final A_WARN_UNUSED
{ return true; }
-
- protected:
- static void processMapAccountId(Net::MessageIn &msg);
-
- static void processMapLogin(Net::MessageIn &msg);
-
- static void processServerTick(Net::MessageIn &msg);
-
- static void processMapAuthRefuse(Net::MessageIn &msg);
};
} // namespace EAthena
diff --git a/src/net/eathena/gamerecv.cpp b/src/net/eathena/gamerecv.cpp
new file mode 100644
index 000000000..e86411712
--- /dev/null
+++ b/src/net/eathena/gamerecv.cpp
@@ -0,0 +1,89 @@
+/*
+ * 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/eathena/gamerecv.h"
+
+#include "client.h"
+#include "logger.h"
+
+#include "being/localplayer.h"
+
+#include "net/serverfeatures.h"
+
+#include "net/ea/token.h"
+
+#include "net/eathena/loginhandler.h"
+#include "net/eathena/messageout.h"
+#include "net/eathena/network.h"
+#include "net/eathena/protocol.h"
+
+#include "debug.h"
+
+namespace EAthena
+{
+
+extern ServerInfo mapServer;
+
+void GameRecv::processMapAccountId(Net::MessageIn &msg)
+{
+ // ignored, because we already know local player account id.
+ msg.readBeingId("account id");
+}
+
+void GameRecv::processMapLogin(Net::MessageIn &msg)
+{
+ unsigned char direction;
+ uint16_t x, y;
+ msg.readInt32("start time");
+ msg.readCoordinates(x, y, direction, "position");
+ msg.readInt8("x size");
+ msg.readInt8("y size");
+ logger->log("Protocol: Player start position: "
+ "(%d, %d), Direction: %d",
+ x, y, direction);
+ msg.readInt16("font");
+ msg.readUInt8("sex");
+
+ 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);
+}
+
+void GameRecv::processServerTick(Net::MessageIn &msg)
+{
+ // ignoring
+ msg.readInt32("tick");
+}
+
+void GameRecv::processMapAuthRefuse(Net::MessageIn &msg)
+{
+ UNIMPLIMENTEDPACKET;
+ msg.readUInt8("error");
+}
+} // namespace EAthena
diff --git a/src/net/eathena/gamerecv.h b/src/net/eathena/gamerecv.h
new file mode 100644
index 000000000..4fa9aa723
--- /dev/null
+++ b/src/net/eathena/gamerecv.h
@@ -0,0 +1,41 @@
+/*
+ * 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_EATHENA_GAMERECV_H
+#define NET_EATHENA_GAMERECV_H
+
+#include "net/eathena/messagehandler.h"
+
+#include "net/ea/gamehandler.h"
+
+namespace EAthena
+{
+ namespace GameRecv
+ {
+ void processMapAccountId(Net::MessageIn &msg);
+ void processMapLogin(Net::MessageIn &msg);
+ void processServerTick(Net::MessageIn &msg);
+ void processMapAuthRefuse(Net::MessageIn &msg);
+ } // namespace GameRecv
+} // namespace EAthena
+
+#endif // NET_EATHENA_GAMERECV_H
generated by cgit v1.2.3-70-g09d2 (git 2.46.0) at 2024-11-19 16:02:14 +0000