From bde97e51963bc89b5922707fa628ffbeb7b03b01 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 13 Oct 2014 23:47:18 +0300 Subject: Add empty friends handler. --- src/CMakeLists.txt | 4 +++ src/Makefile.am | 5 ++++ src/net/eathena/friendshandler.cpp | 50 ++++++++++++++++++++++++++++++++++++++ src/net/eathena/friendshandler.h | 43 ++++++++++++++++++++++++++++++++ src/net/eathena/generalhandler.cpp | 5 +++- src/net/eathena/generalhandler.h | 1 + src/net/friendshandler.h | 42 ++++++++++++++++++++++++++++++++ src/net/net.cpp | 2 ++ src/net/tmwa/friendshandler.cpp | 50 ++++++++++++++++++++++++++++++++++++++ src/net/tmwa/friendshandler.h | 43 ++++++++++++++++++++++++++++++++ src/net/tmwa/generalhandler.cpp | 5 +++- src/net/tmwa/generalhandler.h | 1 + 12 files changed, 249 insertions(+), 2 deletions(-) create mode 100644 src/net/eathena/friendshandler.cpp create mode 100644 src/net/eathena/friendshandler.h create mode 100644 src/net/friendshandler.h create mode 100644 src/net/tmwa/friendshandler.cpp create mode 100644 src/net/tmwa/friendshandler.h diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 934c1a1b7..8578634f3 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -1314,6 +1314,8 @@ SET(SRCS_TMWA net/tmwa/chathandler.h net/tmwa/familyhandler.cpp net/tmwa/familyhandler.h + net/tmwa/friendshandler.cpp + net/tmwa/friendshandler.h net/tmwa/gamehandler.cpp net/tmwa/gamehandler.h net/tmwa/generalhandler.cpp @@ -1383,6 +1385,8 @@ SET(SRCS_EATHENA net/eathena/chathandler.h net/eathena/familyhandler.cpp net/eathena/familyhandler.h + net/eathena/friendshandler.cpp + net/eathena/friendshandler.h net/eathena/gamehandler.cpp net/eathena/gamehandler.h net/eathena/generalhandler.cpp diff --git a/src/Makefile.am b/src/Makefile.am index 47b027fcc..91bd4b4db 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -654,6 +654,7 @@ manaplus_SOURCES += gui/widgets/avatarlistbox.cpp \ net/charserverhandler.h \ net/chathandler.h \ net/familyhandler.h \ + net/friendshandler.h \ net/download.cpp \ net/download.h \ net/downloadstatus.h \ @@ -1247,6 +1248,8 @@ manaplus_SOURCES += \ net/tmwa/chathandler.h \ net/tmwa/familyhandler.cpp \ net/tmwa/familyhandler.h \ + net/tmwa/friendshandler.cpp \ + net/tmwa/friendshandler.h \ net/tmwa/gamehandler.cpp \ net/tmwa/gamehandler.h \ net/tmwa/generalhandler.cpp \ @@ -1317,6 +1320,8 @@ manaplus_SOURCES += net/eathena/adminhandler.cpp \ net/eathena/chathandler.h \ net/eathena/familyhandler.cpp \ net/eathena/familyhandler.h \ + net/eathena/friendshandler.cpp \ + net/eathena/friendshandler.h \ net/eathena/gamehandler.cpp \ net/eathena/gamehandler.h \ net/eathena/generalhandler.cpp \ diff --git a/src/net/eathena/friendshandler.cpp b/src/net/eathena/friendshandler.cpp new file mode 100644 index 000000000..55a88c9ed --- /dev/null +++ b/src/net/eathena/friendshandler.cpp @@ -0,0 +1,50 @@ +/* + * 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 . + */ + +#include "net/eathena/friendshandler.h" + +#include "debug.h" + +extern Net::FriendsHandler *friendsHandler; + +namespace EAthena +{ + +FriendsHandler::FriendsHandler() : + MessageHandler() +{ + static const uint16_t _messages[] = + { + 0 + }; + handledMessages = _messages; + friendsHandler = this; +} + +void FriendsHandler::handleMessage(Net::MessageIn &msg) +{ + switch (msg.getId()) + { + default: + break; + } +} + +} // namespace EAthena diff --git a/src/net/eathena/friendshandler.h b/src/net/eathena/friendshandler.h new file mode 100644 index 000000000..3f30a99c0 --- /dev/null +++ b/src/net/eathena/friendshandler.h @@ -0,0 +1,43 @@ +/* + * 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 . + */ + +#ifndef NET_EATHENA_FRIENDSHANDLER_H +#define NET_EATHENA_FRIENDSHANDLER_H + +#include "net/friendshandler.h" + +#include "net/eathena/messagehandler.h" + +namespace EAthena +{ +class FriendsHandler final : public MessageHandler, + public Net::FriendsHandler +{ + public: + FriendsHandler(); + + A_DELETE_COPY(FriendsHandler) + + void handleMessage(Net::MessageIn &msg) override final; +}; + +} // namespace EAthena + +#endif // NET_EATHENA_FRIENDSHANDLER_H diff --git a/src/net/eathena/generalhandler.cpp b/src/net/eathena/generalhandler.cpp index 80277701b..04755c478 100644 --- a/src/net/eathena/generalhandler.cpp +++ b/src/net/eathena/generalhandler.cpp @@ -48,6 +48,7 @@ #include "net/eathena/chathandler.h" #include "net/eathena/charserverhandler.h" #include "net/eathena/familyhandler.h" +#include "net/eathena/friendshandler.h" #include "net/eathena/gamehandler.h" #include "net/eathena/guildhandler.h" #include "net/eathena/homunculushandler.h" @@ -109,7 +110,8 @@ GeneralHandler::GeneralHandler() : mBankHandler(new BankHandler), mMercenaryHandler(new MercenaryHandler), mBuyingStoreHandler(new BuyingStoreHandler), - mHomunculusHandler(new HomunculusHandler) + mHomunculusHandler(new HomunculusHandler), + mFriendsHandler(new FriendsHandler) { static const uint16_t _messages[] = { @@ -282,6 +284,7 @@ void GeneralHandler::load() mNetwork->registerHandler(mMercenaryHandler); mNetwork->registerHandler(mBuyingStoreHandler); mNetwork->registerHandler(mHomunculusHandler); + mNetwork->registerHandler(mFriendsHandler); } void GeneralHandler::reload() diff --git a/src/net/eathena/generalhandler.h b/src/net/eathena/generalhandler.h index c7197d255..5ab20c616 100644 --- a/src/net/eathena/generalhandler.h +++ b/src/net/eathena/generalhandler.h @@ -89,6 +89,7 @@ class GeneralHandler final : public MessageHandler, MessageHandlerPtr mMercenaryHandler; MessageHandlerPtr mBuyingStoreHandler; MessageHandlerPtr mHomunculusHandler; + MessageHandlerPtr mFriendsHandler; }; } // namespace EAthena diff --git a/src/net/friendshandler.h b/src/net/friendshandler.h new file mode 100644 index 000000000..1599c9e6b --- /dev/null +++ b/src/net/friendshandler.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 . + */ + +#ifndef NET_FRIENDSHANDLER_H +#define NET_FRIENDSHANDLER_H + +#include + +#include "localconsts.h" + +namespace Net +{ + +class FriendsHandler notfinal +{ + public: + virtual ~FriendsHandler() + { } +}; + +} // namespace Net + +extern Net::FriendsHandler *friendsHandler; + +#endif // NET_FRIENDSHANDLER_H diff --git a/src/net/net.cpp b/src/net/net.cpp index fc5c109ea..ad6d16cd5 100644 --- a/src/net/net.cpp +++ b/src/net/net.cpp @@ -50,6 +50,7 @@ namespace Net class CharServerHandler; class ChatHandler; class FamilyHandler; + class FriendsHandler; class GameHandler; class GeneralHandler; class GuildHandler; @@ -93,6 +94,7 @@ Net::BankHandler *bankHandler = nullptr; Net::QuestHandler *questHandler = nullptr; Net::BuyingStoreHandler *buyingStoreHandler = nullptr; Net::HomunculusHandler *homunculusHandler = nullptr; +Net::FriendsHandler *friendsHandler = nullptr; namespace Net { diff --git a/src/net/tmwa/friendshandler.cpp b/src/net/tmwa/friendshandler.cpp new file mode 100644 index 000000000..00a243a63 --- /dev/null +++ b/src/net/tmwa/friendshandler.cpp @@ -0,0 +1,50 @@ +/* + * 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 . + */ + +#include "net/tmwa/friendshandler.h" + +#include "debug.h" + +extern Net::FriendsHandler *friendsHandler; + +namespace TmwAthena +{ + +FriendsHandler::FriendsHandler() : + MessageHandler() +{ + static const uint16_t _messages[] = + { + 0 + }; + handledMessages = _messages; + friendsHandler = this; +} + +void FriendsHandler::handleMessage(Net::MessageIn &msg) +{ + switch (msg.getId()) + { + default: + break; + } +} + +} // namespace TmwAthena diff --git a/src/net/tmwa/friendshandler.h b/src/net/tmwa/friendshandler.h new file mode 100644 index 000000000..00081602a --- /dev/null +++ b/src/net/tmwa/friendshandler.h @@ -0,0 +1,43 @@ +/* + * 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 . + */ + +#ifndef NET_TMWA_FRIENDSHANDLER_H +#define NET_TMWA_FRIENDSHANDLER_H + +#include "net/friendshandler.h" + +#include "net/tmwa/messagehandler.h" + +namespace TmwAthena +{ +class FriendsHandler final : public MessageHandler, + public Net::FriendsHandler +{ + public: + FriendsHandler(); + + A_DELETE_COPY(FriendsHandler) + + void handleMessage(Net::MessageIn &msg) override final; +}; + +} // namespace TmwAthena + +#endif // NET_TMWA_FRIENDSHANDLER_H diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp index c37fc86a0..9fcdeed15 100644 --- a/src/net/tmwa/generalhandler.cpp +++ b/src/net/tmwa/generalhandler.cpp @@ -48,6 +48,7 @@ #include "net/tmwa/chathandler.h" #include "net/tmwa/charserverhandler.h" #include "net/tmwa/familyhandler.h" +#include "net/tmwa/friendshandler.h" #include "net/tmwa/gamehandler.h" #include "net/tmwa/guildhandler.h" #include "net/tmwa/homunculushandler.h" @@ -109,7 +110,8 @@ GeneralHandler::GeneralHandler() : mBankHandler(new BankHandler), mMercenaryHandler(new MercenaryHandler), mBuyingStoreHandler(new BuyingStoreHandler), - mHomunculusHandler(new HomunculusHandler) + mHomunculusHandler(new HomunculusHandler), + mFriendsHandler(new FriendsHandler) { static const uint16_t _messages[] = { @@ -231,6 +233,7 @@ void GeneralHandler::load() mNetwork->registerHandler(mMercenaryHandler); mNetwork->registerHandler(mBuyingStoreHandler); mNetwork->registerHandler(mHomunculusHandler); + mNetwork->registerHandler(mFriendsHandler); } void GeneralHandler::reload() diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h index a43d56096..179241a7c 100644 --- a/src/net/tmwa/generalhandler.h +++ b/src/net/tmwa/generalhandler.h @@ -87,6 +87,7 @@ class GeneralHandler final : public MessageHandler, MessageHandlerPtr mMercenaryHandler; MessageHandlerPtr mBuyingStoreHandler; MessageHandlerPtr mHomunculusHandler; + MessageHandlerPtr mFriendsHandler; }; } // namespace TmwAthena -- cgit v1.2.3-60-g2f50