diff options
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/net/eathena/maphandler.cpp | 37 | ||||
| -rw-r--r-- | src/net/eathena/maprecv.cpp | 60 | ||||
| -rw-r--r-- | src/net/eathena/maprecv.h | 39 |
5 files changed, 108 insertions, 32 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 3147346f8..bc4141c5e 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1640,6 +1640,8 @@ SET(SRCS_EATHENA net/eathena/mailrecv.h net/eathena/maphandler.cpp net/eathena/maphandler.h + net/eathena/maprecv.cpp + net/eathena/maprecv.h net/eathena/maptypeproperty2.h net/eathena/markethandler.cpp net/eathena/markethandler.h diff --git a/src/Makefile.am b/src/Makefile.am index cadf09784..6d34cc7c7 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1486,6 +1486,8 @@ manaplus_SOURCES += gui/windows/bankwindow.cpp \ net/eathena/mailrecv.h \ net/eathena/maphandler.cpp \ net/eathena/maphandler.h \ + net/eathena/maprecv.cpp \ + net/eathena/maprecv.h \ net/eathena/maptypeproperty2.h \ net/eathena/markethandler.cpp \ net/eathena/markethandler.h \ diff --git a/src/net/eathena/maphandler.cpp b/src/net/eathena/maphandler.cpp index ee43bcfe0..533307e4d 100644 --- a/src/net/eathena/maphandler.cpp +++ b/src/net/eathena/maphandler.cpp @@ -22,6 +22,7 @@ #include "logger.h" +#include "net/eathena/maprecv.h" #include "net/eathena/protocol.h" #include "debug.h" @@ -51,19 +52,19 @@ void MapHandler::handleMessage(Net::MessageIn &msg) switch (msg.getId()) { case SMSG_INSTANCE_START: - processInstanceStart(msg); + MapRecv::processInstanceStart(msg); break; case SMSG_INSTANCE_CREATE: - processInstanceCreate(msg); + MapRecv::processInstanceCreate(msg); break; case SMSG_INSTANCE_INFO: - processInstanceInfo(msg); + MapRecv::processInstanceInfo(msg); break; case SMSG_INSTANCE_DELETE: - processInstanceDelete(msg); + MapRecv::processInstanceDelete(msg); break; default: @@ -71,32 +72,4 @@ void MapHandler::handleMessage(Net::MessageIn &msg) } } -void MapHandler::processInstanceStart(Net::MessageIn &msg) -{ - UNIMPLIMENTEDPACKET; - msg.readString(61, "instance name"); - msg.readInt16("flag"); -} - -void MapHandler::processInstanceCreate(Net::MessageIn &msg) -{ - UNIMPLIMENTEDPACKET; - msg.readInt16("flag"); -} - -void MapHandler::processInstanceInfo(Net::MessageIn &msg) -{ - UNIMPLIMENTEDPACKET; - msg.readString(61, "instance name"); - msg.readInt32("remaining time"); - msg.readInt32("no players close time"); -} - -void MapHandler::processInstanceDelete(Net::MessageIn &msg) -{ - UNIMPLIMENTEDPACKET; - msg.readInt32("flag"); - msg.readInt32("unused"); -} - } // namespace EAthena diff --git a/src/net/eathena/maprecv.cpp b/src/net/eathena/maprecv.cpp new file mode 100644 index 000000000..9d4f39254 --- /dev/null +++ b/src/net/eathena/maprecv.cpp @@ -0,0 +1,60 @@ +/* + * The ManaPlus Client + * 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/maprecv.h" + +#include "logger.h" + +#include "net/eathena/protocol.h" + +#include "debug.h" + +namespace EAthena +{ + +void MapRecv::processInstanceStart(Net::MessageIn &msg) +{ + UNIMPLIMENTEDPACKET; + msg.readString(61, "instance name"); + msg.readInt16("flag"); +} + +void MapRecv::processInstanceCreate(Net::MessageIn &msg) +{ + UNIMPLIMENTEDPACKET; + msg.readInt16("flag"); +} + +void MapRecv::processInstanceInfo(Net::MessageIn &msg) +{ + UNIMPLIMENTEDPACKET; + msg.readString(61, "instance name"); + msg.readInt32("remaining time"); + msg.readInt32("no players close time"); +} + +void MapRecv::processInstanceDelete(Net::MessageIn &msg) +{ + UNIMPLIMENTEDPACKET; + msg.readInt32("flag"); + msg.readInt32("unused"); +} + +} // namespace EAthena diff --git a/src/net/eathena/maprecv.h b/src/net/eathena/maprecv.h new file mode 100644 index 000000000..14b9f74cd --- /dev/null +++ b/src/net/eathena/maprecv.h @@ -0,0 +1,39 @@ +/* + * The ManaPlus Client + * 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_MAPRECV_H +#define NET_EATHENA_MAPRECV_H + +#include "net/maphandler.h" + +#include "net/eathena/messagehandler.h" + +namespace EAthena +{ + namespace MapRecv + { + void processInstanceStart(Net::MessageIn &msg); + void processInstanceCreate(Net::MessageIn &msg); + void processInstanceInfo(Net::MessageIn &msg); + void processInstanceDelete(Net::MessageIn &msg); + } // namespace MapRecv +} // namespace EAthena + +#endif // NET_EATHENA_MAPRECV_H |