diff options
-rw-r--r-- | src/CMakeLists.txt | 1 | ||||
-rw-r--r-- | src/Makefile.am | 5 | ||||
-rw-r--r-- | src/net/eathena/generalhandler.cpp | 5 | ||||
-rw-r--r-- | src/net/eathena/generalhandler.h | 1 | ||||
-rw-r--r-- | src/net/eathena/homunculushandler.cpp | 57 | ||||
-rw-r--r-- | src/net/eathena/homunculushandler.h | 45 | ||||
-rw-r--r-- | src/net/homunculushandler.h | 42 | ||||
-rw-r--r-- | src/net/net.cpp | 2 | ||||
-rw-r--r-- | src/net/tmwa/generalhandler.cpp | 5 | ||||
-rw-r--r-- | src/net/tmwa/generalhandler.h | 1 | ||||
-rw-r--r-- | src/net/tmwa/homunculushandler.cpp | 45 | ||||
-rw-r--r-- | src/net/tmwa/homunculushandler.h | 44 |
12 files changed, 251 insertions, 2 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e318bf3ce..54ca138c9 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -530,6 +530,7 @@ SET(SRCS net/gamehandler.h net/generalhandler.h net/guildhandler.h + net/homunculushandler.h net/inventoryhandler.h net/ipc.cpp net/ipc.h diff --git a/src/Makefile.am b/src/Makefile.am index 021346f4b..3207b812b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -657,6 +657,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ net/gamehandler.h \ net/generalhandler.h \ net/guildhandler.h \ + net/homunculushandler.h \ net/inventoryhandler.h \ net/ipc.cpp \ net/ipc.h \ @@ -1246,6 +1247,8 @@ manaplus_SOURCES += \ net/tmwa/generalhandler.h \ net/tmwa/guildhandler.cpp \ net/tmwa/guildhandler.h \ + net/tmwa/homunculushandler.cpp \ + net/tmwa/homunculushandler.h \ net/tmwa/inventoryhandler.cpp \ net/tmwa/inventoryhandler.h \ net/tmwa/itemhandler.cpp \ @@ -1315,6 +1318,8 @@ manaplus_SOURCES += net/eathena/adminhandler.cpp \ net/eathena/generalhandler.h \ net/eathena/guildhandler.cpp \ net/eathena/guildhandler.h \ + net/eathena/homunculushandler.cpp \ + net/eathena/homunculushandler.h \ net/eathena/inventoryhandler.cpp \ net/eathena/inventoryhandler.h \ net/eathena/itemhandler.cpp \ diff --git a/src/net/eathena/generalhandler.cpp b/src/net/eathena/generalhandler.cpp index dba1ee41e..2b5da81e4 100644 --- a/src/net/eathena/generalhandler.cpp +++ b/src/net/eathena/generalhandler.cpp @@ -51,6 +51,7 @@ #include "net/eathena/familyhandler.h" #include "net/eathena/gamehandler.h" #include "net/eathena/guildhandler.h" +#include "net/eathena/homunculushandler.h" #include "net/eathena/inventoryhandler.h" #include "net/eathena/itemhandler.h" #include "net/eathena/loginhandler.h" @@ -108,7 +109,8 @@ GeneralHandler::GeneralHandler() : mFamilyHandler(new FamilyHandler), mBankHandler(new BankHandler), mMercenaryHandler(new MercenaryHandler), - mBuyingStoreHandler(new BuyingStoreHandler) + mBuyingStoreHandler(new BuyingStoreHandler), + mHomunculusHandler(new HomunculusHandler) { static const uint16_t _messages[] = { @@ -213,6 +215,7 @@ void GeneralHandler::load() mNetwork->registerHandler(mBankHandler); mNetwork->registerHandler(mMercenaryHandler); mNetwork->registerHandler(mBuyingStoreHandler); + mNetwork->registerHandler(mHomunculusHandler); } void GeneralHandler::reload() diff --git a/src/net/eathena/generalhandler.h b/src/net/eathena/generalhandler.h index 56070b247..7f68f5f54 100644 --- a/src/net/eathena/generalhandler.h +++ b/src/net/eathena/generalhandler.h @@ -86,6 +86,7 @@ class GeneralHandler final : public MessageHandler, MessageHandlerPtr mBankHandler; MessageHandlerPtr mMercenaryHandler; MessageHandlerPtr mBuyingStoreHandler; + MessageHandlerPtr mHomunculusHandler; }; } // namespace EAthena diff --git a/src/net/eathena/homunculushandler.cpp b/src/net/eathena/homunculushandler.cpp new file mode 100644 index 000000000..c00025daa --- /dev/null +++ b/src/net/eathena/homunculushandler.cpp @@ -0,0 +1,57 @@ +/* + * The ManaPlus Client + * Copyright (C) 2011-2014 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/homunculushandler.h" + +#include "logger.h" + +#include "net/ea/eaprotocol.h" + +#include "net/eathena/messageout.h" +#include "net/eathena/protocol.h" + +#include "debug.h" + +extern Net::HomunculusHandler *homunculusHandler; + +namespace EAthena +{ + +HomunculusHandler::HomunculusHandler() : + MessageHandler() +{ + static const uint16_t _messages[] = + { + 0 + }; + handledMessages = _messages; + homunculusHandler = this; +} + +void HomunculusHandler::handleMessage(Net::MessageIn &msg) +{ + switch (msg.getId()) + { + default: + break; + } +} + +} // namespace EAthena diff --git a/src/net/eathena/homunculushandler.h b/src/net/eathena/homunculushandler.h new file mode 100644 index 000000000..9a2e5bd76 --- /dev/null +++ b/src/net/eathena/homunculushandler.h @@ -0,0 +1,45 @@ +/* + * The ManaPlus Client + * Copyright (C) 2011-2014 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_HOMUNCULUSHANDLER_H +#define NET_EATHENA_HOMUNCULUSHANDLER_H + +#include "net/homunculushandler.h" + +#include "net/eathena/messagehandler.h" + +namespace EAthena +{ +class MessageOut; + +class HomunculusHandler final : public MessageHandler, + public Net::HomunculusHandler +{ + public: + HomunculusHandler(); + + A_DELETE_COPY(HomunculusHandler) + + void handleMessage(Net::MessageIn &msg) override final; +}; + +} // namespace EAthena + +#endif // NET_EATHENA_HOMUNCULUSHANDLER_H diff --git a/src/net/homunculushandler.h b/src/net/homunculushandler.h new file mode 100644 index 000000000..cc1d15b1e --- /dev/null +++ b/src/net/homunculushandler.h @@ -0,0 +1,42 @@ +/* + * The ManaPlus Client + * Copyright (C) 2011-2014 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_HOMUNCULUSHANDLER_H +#define NET_HOMUNCULUSHANDLER_H + +#include <string> + +#include "localconsts.h" + +namespace Net +{ + +class HomunculusHandler notfinal +{ + public: + virtual ~HomunculusHandler() + { } +}; + +} // namespace Net + +extern Net::HomunculusHandler *homunculusHandler; + +#endif // NET_HOMUNCULUSHANDLER_H diff --git a/src/net/net.cpp b/src/net/net.cpp index 28bdb22a8..3baec6059 100644 --- a/src/net/net.cpp +++ b/src/net/net.cpp @@ -55,6 +55,7 @@ namespace Net class GameHandler; class GeneralHandler; class GuildHandler; + class HomunculusHandler; class InventoryHandler; class LoginHandler; class MailHandler; @@ -94,6 +95,7 @@ Net::FamilyHandler *familyHandler = nullptr; Net::BankHandler *bankHandler = nullptr; Net::QuestHandler *questHandler = nullptr; Net::BuyingStoreHandler *buyingStoreHandler = nullptr; +Net::HomunculusHandler *homunculusHandler = nullptr; namespace Net { diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp index 9a24d6a4e..bde54c207 100644 --- a/src/net/tmwa/generalhandler.cpp +++ b/src/net/tmwa/generalhandler.cpp @@ -51,6 +51,7 @@ #include "net/tmwa/familyhandler.h" #include "net/tmwa/gamehandler.h" #include "net/tmwa/guildhandler.h" +#include "net/tmwa/homunculushandler.h" #include "net/tmwa/inventoryhandler.h" #include "net/tmwa/itemhandler.h" #include "net/tmwa/loginhandler.h" @@ -108,7 +109,8 @@ GeneralHandler::GeneralHandler() : mFamilyHandler(new FamilyHandler), mBankHandler(new BankHandler), mMercenaryHandler(new MercenaryHandler), - mBuyingStoreHandler(new BuyingStoreHandler) + mBuyingStoreHandler(new BuyingStoreHandler), + mHomunculusHandler(new HomunculusHandler) { static const uint16_t _messages[] = { @@ -229,6 +231,7 @@ void GeneralHandler::load() mNetwork->registerHandler(mBankHandler); mNetwork->registerHandler(mMercenaryHandler); mNetwork->registerHandler(mBuyingStoreHandler); + mNetwork->registerHandler(mHomunculusHandler); } void GeneralHandler::reload() diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h index 83d1f574f..a43d56096 100644 --- a/src/net/tmwa/generalhandler.h +++ b/src/net/tmwa/generalhandler.h @@ -86,6 +86,7 @@ class GeneralHandler final : public MessageHandler, MessageHandlerPtr mBankHandler; MessageHandlerPtr mMercenaryHandler; MessageHandlerPtr mBuyingStoreHandler; + MessageHandlerPtr mHomunculusHandler; }; } // namespace TmwAthena diff --git a/src/net/tmwa/homunculushandler.cpp b/src/net/tmwa/homunculushandler.cpp new file mode 100644 index 000000000..e9cecc71c --- /dev/null +++ b/src/net/tmwa/homunculushandler.cpp @@ -0,0 +1,45 @@ +/* + * The ManaPlus Client + * Copyright (C) 2011-2014 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/homunculushandler.h" + +#include "debug.h" + +extern Net::HomunculusHandler *homunculusHandler; + +namespace TmwAthena +{ + +HomunculusHandler::HomunculusHandler() : + MessageHandler() +{ + static const uint16_t _messages[] = + { + 0 + }; + handledMessages = _messages; + homunculusHandler = this; +} + +void HomunculusHandler::handleMessage(Net::MessageIn &msg A_UNUSED) +{ +} + +} // namespace TmwAthena diff --git a/src/net/tmwa/homunculushandler.h b/src/net/tmwa/homunculushandler.h new file mode 100644 index 000000000..444d4aff9 --- /dev/null +++ b/src/net/tmwa/homunculushandler.h @@ -0,0 +1,44 @@ +/* + * The ManaPlus Client + * Copyright (C) 2011-2014 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_HOMUNCULUSHANDLER_H +#define NET_TMWA_HOMUNCULUSHANDLER_H + +#include "net/homunculushandler.h" + +#include "net/tmwa/messagehandler.h" + +namespace TmwAthena +{ + +class HomunculusHandler final : public MessageHandler, + public Net::HomunculusHandler +{ + public: + HomunculusHandler(); + + A_DELETE_COPY(HomunculusHandler) + + void handleMessage(Net::MessageIn &msg) override final; +}; + +} // namespace TmwAthena + +#endif // NET_TMWA_HOMUNCULUSHANDLER_H |