summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-08-26 16:07:42 +0300
committerAndrei Karas <akaras@inbox.ru>2015-08-26 16:07:42 +0300
commit653447ca463eaf573e7123896155b538b8dec869 (patch)
treee42caca83d294891a06165b2b1feb2414641b6dc
parent6fd6deb1ba87ddf74bff15055421f2b434b96f85 (diff)
downloadmv-653447ca463eaf573e7123896155b538b8dec869.tar.gz
mv-653447ca463eaf573e7123896155b538b8dec869.tar.bz2
mv-653447ca463eaf573e7123896155b538b8dec869.tar.xz
mv-653447ca463eaf573e7123896155b538b8dec869.zip
Move receive code from gamehandler into separate file.
-rw-r--r--src/CMakeLists.txt6
-rw-r--r--src/Makefile.am6
-rw-r--r--src/net/ea/gamehandler.cpp50
-rw-r--r--src/net/ea/gamehandler.h10
-rw-r--r--src/net/ea/gamerecv.cpp81
-rw-r--r--src/net/ea/gamerecv.h48
-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
-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
14 files changed, 407 insertions, 155 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ed491f599..2615d52ff 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -1363,6 +1363,8 @@ SET(SRCS_EVOL
net/ea/equipbackend.h
net/ea/gamehandler.cpp
net/ea/gamehandler.h
+ net/ea/gamerecv.cpp
+ net/ea/gamerecv.h
net/ea/guildhandler.cpp
net/ea/guildhandler.h
net/ea/inventoryhandler.cpp
@@ -1411,6 +1413,8 @@ SET(SRCS_TMWA
net/tmwa/chatrecv.h
net/tmwa/gamehandler.cpp
net/tmwa/gamehandler.h
+ net/tmwa/gamerecv.cpp
+ net/tmwa/gamerecv.h
net/tmwa/generalhandler.cpp
net/tmwa/generalhandler.h
net/tmwa/guildhandler.cpp
@@ -1585,6 +1589,8 @@ SET(SRCS_EATHENA
net/eathena/friendsrecv.h
net/eathena/gamehandler.cpp
net/eathena/gamehandler.h
+ net/eathena/gamerecv.cpp
+ net/eathena/gamerecv.h
net/eathena/generalhandler.cpp
net/eathena/generalhandler.h
net/eathena/guildhandler.cpp
diff --git a/src/Makefile.am b/src/Makefile.am
index 81a25b7e5..99e1443cb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1205,6 +1205,8 @@ manaplus_SOURCES += main.cpp \
net/ea/equipbackend.h \
net/ea/gamehandler.cpp \
net/ea/gamehandler.h \
+ net/ea/gamerecv.cpp \
+ net/ea/gamerecv.h \
net/ea/guildhandler.cpp \
net/ea/guildhandler.h \
net/ea/inventoryhandler.cpp \
@@ -1254,6 +1256,8 @@ manaplus_SOURCES += \
net/tmwa/chatrecv.h \
net/tmwa/gamehandler.cpp \
net/tmwa/gamehandler.h \
+ net/tmwa/gamerecv.cpp \
+ net/tmwa/gamerecv.h \
net/tmwa/generalhandler.cpp \
net/tmwa/generalhandler.h \
net/tmwa/guildhandler.cpp \
@@ -1431,6 +1435,8 @@ manaplus_SOURCES += gui/windows/bankwindow.cpp \
net/eathena/friendsrecv.h \
net/eathena/gamehandler.cpp \
net/eathena/gamehandler.h \
+ net/eathena/gamerecv.cpp \
+ net/eathena/gamerecv.h \
net/eathena/generalhandler.cpp \
net/eathena/generalhandler.h \
net/eathena/guildhandler.cpp \
diff --git a/src/net/ea/gamehandler.cpp b/src/net/ea/gamehandler.cpp
index 8f21edf8f..4f8734e92 100644
--- a/src/net/ea/gamehandler.cpp
+++ b/src/net/ea/gamehandler.cpp
@@ -34,6 +34,8 @@
#include "net/messagein.h"
+#include "net/ea/gamerecv.h"
+
#include "utils/gettext.h"
#include "debug.h"
@@ -41,14 +43,11 @@
namespace Ea
{
-std::string GameHandler::mMap;
-BeingId GameHandler::mCharID = BeingId_zero;
-
GameHandler::GameHandler() :
Net::GameHandler()
{
- mMap.clear();
- mCharID = BeingId_zero;
+ GameRecv::mMap.clear();
+ GameRecv::mCharID = BeingId_zero;
}
void GameHandler::who() const
@@ -57,50 +56,19 @@ void GameHandler::who() const
void GameHandler::setMap(const std::string &map)
{
- mMap = map.substr(0, map.rfind("."));
-}
-
-void GameHandler::processWhoAnswer(Net::MessageIn &msg)
-{
- NotifyManager::notify(NotifyTypes::ONLINE_USERS,
- msg.readInt32("users count"));
-}
-
-void GameHandler::processCharSwitchResponse(Net::MessageIn &msg)
-{
- if (msg.readUInt8("response"))
- client->setState(STATE_SWITCH_CHARACTER);
-}
-
-void GameHandler::processMapQuitResponse(Net::MessageIn &msg)
-{
- if (msg.readUInt8("response"))
- {
- CREATEWIDGET(OkDialog,
- // TRANSLATORS: error header
- _("Game"),
- // TRANSLATORS: error message
- _("Request to quit denied!"),
- // TRANSLATORS: ok dialog button
- _("OK"),
- DialogType::ERROR,
- Modal_true,
- ShowCenter_true,
- nullptr,
- 260);
- }
+ GameRecv::mMap = map.substr(0, map.rfind("."));
}
void GameHandler::clear()
{
- mMap.clear();
- mCharID = BeingId_zero;
+ GameRecv::mMap.clear();
+ GameRecv::mCharID = BeingId_zero;
}
void GameHandler::initEngines() const
{
- if (!mMap.empty())
- Game::instance()->changeMap(mMap);
+ if (!GameRecv::mMap.empty())
+ Game::instance()->changeMap(GameRecv::mMap);
}
} // namespace Ea
diff --git a/src/net/ea/gamehandler.h b/src/net/ea/gamehandler.h
index ee1f12701..17834b333 100644
--- a/src/net/ea/gamehandler.h
+++ b/src/net/ea/gamehandler.h
@@ -55,16 +55,6 @@ class GameHandler notfinal : public Net::GameHandler
void clear() override final;
void initEngines() const override final;
-
- protected:
- static void processWhoAnswer(Net::MessageIn &msg);
-
- static void processCharSwitchResponse(Net::MessageIn &msg);
-
- static void processMapQuitResponse(Net::MessageIn &msg);
-
- static std::string mMap;
- static BeingId mCharID; // < Saved for map-server switching
};
} // namespace Ea
diff --git a/src/net/ea/gamerecv.cpp b/src/net/ea/gamerecv.cpp
new file mode 100644
index 000000000..73fe3a01e
--- /dev/null
+++ b/src/net/ea/gamerecv.cpp
@@ -0,0 +1,81 @@
+/*
+ * 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/ea/gamerecv.h"
+
+#include "client.h"
+#include "game.h"
+#include "notifymanager.h"
+
+#include "enums/resources/notifytypes.h"
+
+#include "gui/windows/okdialog.h"
+
+#include "gui/widgets/createwidget.h"
+
+#include "net/messagein.h"
+
+#include "utils/gettext.h"
+
+#include "debug.h"
+
+namespace Ea
+{
+
+namespace GameRecv
+{
+ std::string mMap;
+ BeingId mCharID = BeingId_zero;
+} // namespace GameRev
+
+void GameRecv::processWhoAnswer(Net::MessageIn &msg)
+{
+ NotifyManager::notify(NotifyTypes::ONLINE_USERS,
+ msg.readInt32("users count"));
+}
+
+void GameRecv::processCharSwitchResponse(Net::MessageIn &msg)
+{
+ if (msg.readUInt8("response"))
+ client->setState(STATE_SWITCH_CHARACTER);
+}
+
+void GameRecv::processMapQuitResponse(Net::MessageIn &msg)
+{
+ if (msg.readUInt8("response"))
+ {
+ CREATEWIDGET(OkDialog,
+ // TRANSLATORS: error header
+ _("Game"),
+ // TRANSLATORS: error message
+ _("Request to quit denied!"),
+ // TRANSLATORS: ok dialog button
+ _("OK"),
+ DialogType::ERROR,
+ Modal_true,
+ ShowCenter_true,
+ nullptr,
+ 260);
+ }
+}
+
+} // namespace Ea
diff --git a/src/net/ea/gamerecv.h b/src/net/ea/gamerecv.h
new file mode 100644
index 000000000..a35b13825
--- /dev/null
+++ b/src/net/ea/gamerecv.h
@@ -0,0 +1,48 @@
+/*
+ * 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_EA_GAMERECV_H
+#define NET_EA_GAMERECV_H
+
+#include "enums/simpletypes/beingid.h"
+
+#include "net/gamehandler.h"
+
+namespace Net
+{
+ class MessageIn;
+}
+
+namespace Ea
+{
+ namespace GameRecv
+ {
+ extern std::string mMap;
+ extern BeingId mCharID; // < Saved for map-server switching
+
+ void processWhoAnswer(Net::MessageIn &msg);
+ void processCharSwitchResponse(Net::MessageIn &msg);
+ void processMapQuitResponse(Net::MessageIn &msg);
+ } // namespace GameRecv
+} // namespace Ea
+
+#endif // NET_EA_GAMERECV_H
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
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