summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-10-07 16:26:44 +0300
committerAndrei Karas <akaras@inbox.ru>2014-10-07 16:26:44 +0300
commit726a46299e2efb1e010fa8524dba19871a0c6294 (patch)
tree3ce9faed100daea04600a6f3b8171dd49b791bb9
parenta3cedd77c73c820d6125aaa4b8f3dacbe92705c4 (diff)
downloadplus-726a46299e2efb1e010fa8524dba19871a0c6294.tar.gz
plus-726a46299e2efb1e010fa8524dba19871a0c6294.tar.bz2
plus-726a46299e2efb1e010fa8524dba19871a0c6294.tar.xz
plus-726a46299e2efb1e010fa8524dba19871a0c6294.zip
Move processGuildExpulsionList from ea namespace into eathena and tmwa.
-rw-r--r--src/net/ea/guildhandler.cpp16
-rw-r--r--src/net/ea/guildhandler.h2
-rw-r--r--src/net/eathena/guildhandler.cpp16
-rw-r--r--src/net/eathena/guildhandler.h2
-rw-r--r--src/net/tmwa/guildhandler.cpp16
-rw-r--r--src/net/tmwa/guildhandler.h2
6 files changed, 36 insertions, 18 deletions
diff --git a/src/net/ea/guildhandler.cpp b/src/net/ea/guildhandler.cpp
index 0cc03d805..234ad4933 100644
--- a/src/net/ea/guildhandler.cpp
+++ b/src/net/ea/guildhandler.cpp
@@ -448,22 +448,6 @@ void GuildHandler::processGuildLeave(Net::MessageIn &msg) const
}
}
-void GuildHandler::processGuildExpulsionList(Net::MessageIn &msg) const
-{
- const int length = msg.readInt16();
- if (length < 4)
- return;
-
- const int count = (length - 4) / 88;
-
- for (int i = 0; i < count; i++)
- {
- msg.readString(24); // Name (of expulsed?)
- msg.readString(24); // 'Acc' (name of expulser?)
- msg.readString(24); // Message
- }
-}
-
void GuildHandler::processGuildMessage(Net::MessageIn &msg) const
{
const int msgLength = msg.readInt16() - 4;
diff --git a/src/net/ea/guildhandler.h b/src/net/ea/guildhandler.h
index 2bfa4c4a2..3c7446605 100644
--- a/src/net/ea/guildhandler.h
+++ b/src/net/ea/guildhandler.h
@@ -81,8 +81,6 @@ class GuildHandler notfinal : public Net::GuildHandler
virtual void processGuildLeave(Net::MessageIn &msg) const;
- virtual void processGuildExpulsionList(Net::MessageIn &msg) const;
-
virtual void processGuildMessage(Net::MessageIn &msg) const;
virtual void processGuildSkillUp(Net::MessageIn &msg) const;
diff --git a/src/net/eathena/guildhandler.cpp b/src/net/eathena/guildhandler.cpp
index 8beedbedd..63d88c624 100644
--- a/src/net/eathena/guildhandler.cpp
+++ b/src/net/eathena/guildhandler.cpp
@@ -427,4 +427,20 @@ void GuildHandler::processGuildExpulsion(Net::MessageIn &msg) const
processGuildExpulsionContinue(nick);
}
+void GuildHandler::processGuildExpulsionList(Net::MessageIn &msg) const
+{
+ const int length = msg.readInt16();
+ if (length < 4)
+ return;
+
+ const int count = (length - 4) / 88;
+
+ for (int i = 0; i < count; i++)
+ {
+ msg.readString(24); // Name (of expulsed?)
+ msg.readString(24); // 'Acc' (name of expulser?)
+ msg.readString(24); // Message
+ }
+}
+
} // namespace EAthena
diff --git a/src/net/eathena/guildhandler.h b/src/net/eathena/guildhandler.h
index 7370da44e..af070a3e3 100644
--- a/src/net/eathena/guildhandler.h
+++ b/src/net/eathena/guildhandler.h
@@ -81,6 +81,8 @@ class GuildHandler final : public Ea::GuildHandler, public MessageHandler
void processGuildMemberLogin(Net::MessageIn &msg) const;
void processGuildExpulsion(Net::MessageIn &msg) const;
+
+ void processGuildExpulsionList(Net::MessageIn &msg) const;
};
// extern Ea::GuildTab *guildTab;
diff --git a/src/net/tmwa/guildhandler.cpp b/src/net/tmwa/guildhandler.cpp
index ec7c9541a..0c1757f86 100644
--- a/src/net/tmwa/guildhandler.cpp
+++ b/src/net/tmwa/guildhandler.cpp
@@ -414,4 +414,20 @@ void GuildHandler::processGuildExpulsion(Net::MessageIn &msg) const
processGuildExpulsionContinue(nick);
}
+void GuildHandler::processGuildExpulsionList(Net::MessageIn &msg) const
+{
+ const int length = msg.readInt16("len");
+ if (length < 4)
+ return;
+
+ const int count = (length - 4) / 88;
+
+ for (int i = 0; i < count; i++)
+ {
+ msg.readString(24, "name of expulsed");
+ msg.readString(24, "name of expluser");
+ msg.readString(24, "message");
+ }
+}
+
} // namespace TmwAthena
diff --git a/src/net/tmwa/guildhandler.h b/src/net/tmwa/guildhandler.h
index acc32e70b..35f10bbbf 100644
--- a/src/net/tmwa/guildhandler.h
+++ b/src/net/tmwa/guildhandler.h
@@ -79,6 +79,8 @@ class GuildHandler final : public Ea::GuildHandler, public MessageHandler
void processGuildMemberLogin(Net::MessageIn &msg) const;
void processGuildExpulsion(Net::MessageIn &msg) const;
+
+ void processGuildExpulsionList(Net::MessageIn &msg) const;
};
extern Ea::GuildTab *guildTab;