From 7859c4315e8c59ebeef3b6b030f921badd542f09 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Tue, 7 Oct 2014 16:07:32 +0300 Subject: Move processGuildExpulsion from ea namespace into eathena and tmwa. --- src/net/eathena/guildhandler.cpp | 15 +++++++++++++++ src/net/eathena/guildhandler.h | 2 ++ 2 files changed, 17 insertions(+) (limited to 'src/net/eathena') diff --git a/src/net/eathena/guildhandler.cpp b/src/net/eathena/guildhandler.cpp index 51ff00cce..6c740c945 100644 --- a/src/net/eathena/guildhandler.cpp +++ b/src/net/eathena/guildhandler.cpp @@ -23,6 +23,7 @@ #include "actormanager.h" #include "configuration.h" +#include "notifymanager.h" #include "being/localplayer.h" #include "being/playerinfo.h" @@ -35,6 +36,10 @@ #include "net/eathena/messageout.h" #include "net/eathena/protocol.h" +#include "resources/notifytypes.h" + +#include "utils/delete2.h" + #include "debug.h" extern Net::GuildHandler *guildHandler; @@ -414,4 +419,14 @@ void GuildHandler::processGuildMemberLogin(Net::MessageIn &msg) const } } +void GuildHandler::processGuildExpulsion(Net::MessageIn &msg) const +{ + msg.skip(2); // size (can be many explusions in list) + const std::string nick = msg.readString(24); // Name (of expulsed?) + msg.skip(24); // acc + msg.readString(44); // Message + + processGuildExpulsionContinue(nick); +} + } // namespace EAthena diff --git a/src/net/eathena/guildhandler.h b/src/net/eathena/guildhandler.h index 7f8d4ba6a..7370da44e 100644 --- a/src/net/eathena/guildhandler.h +++ b/src/net/eathena/guildhandler.h @@ -79,6 +79,8 @@ class GuildHandler final : public Ea::GuildHandler, public MessageHandler void processGuildPositionInfo(Net::MessageIn &msg) const; void processGuildMemberLogin(Net::MessageIn &msg) const; + + void processGuildExpulsion(Net::MessageIn &msg) const; }; // extern Ea::GuildTab *guildTab; -- cgit v1.2.3-60-g2f50