summaryrefslogtreecommitdiff
path: root/src/net/eathena
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-10-07 16:07:32 +0300
committerAndrei Karas <akaras@inbox.ru>2014-10-07 16:14:32 +0300
commit7859c4315e8c59ebeef3b6b030f921badd542f09 (patch)
tree69986384245e2bb7f8b21da816ea8978475f6fd7 /src/net/eathena
parent629aa611136745eba65dbae6ed8762c133161894 (diff)
downloadplus-7859c4315e8c59ebeef3b6b030f921badd542f09.tar.gz
plus-7859c4315e8c59ebeef3b6b030f921badd542f09.tar.bz2
plus-7859c4315e8c59ebeef3b6b030f921badd542f09.tar.xz
plus-7859c4315e8c59ebeef3b6b030f921badd542f09.zip
Move processGuildExpulsion from ea namespace into eathena and tmwa.
Diffstat (limited to 'src/net/eathena')
-rw-r--r--src/net/eathena/guildhandler.cpp15
-rw-r--r--src/net/eathena/guildhandler.h2
2 files changed, 17 insertions, 0 deletions
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;