diff options
| author | rawng <rawng@debian.house> | 2015-08-07 18:54:41 -0400 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2015-08-09 00:32:13 +0300 |
| commit | f14d35ee3f1b5319a423a1efd8366ac524382ac2 (patch) | |
| tree | c669ba094b496a276e37ec51422183f29602ec74 /src/net/tmwa/guildhandler.cpp | |
| parent | 58fc50f70ab9223f5692dd93933bde0542a401df (diff) | |
| download | manaplus-f14d35ee3f1b5319a423a1efd8366ac524382ac2.tar.gz manaplus-f14d35ee3f1b5319a423a1efd8366ac524382ac2.tar.bz2 manaplus-f14d35ee3f1b5319a423a1efd8366ac524382ac2.tar.xz manaplus-f14d35ee3f1b5319a423a1efd8366ac524382ac2.zip | |
Add server feature haveNewGuild
Diffstat (limited to 'src/net/tmwa/guildhandler.cpp')
| -rw-r--r-- | src/net/tmwa/guildhandler.cpp | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/src/net/tmwa/guildhandler.cpp b/src/net/tmwa/guildhandler.cpp index 41d169395..4bd0e800c 100644 --- a/src/net/tmwa/guildhandler.cpp +++ b/src/net/tmwa/guildhandler.cpp @@ -398,9 +398,20 @@ void GuildHandler::processGuildMemberLogin(Net::MessageIn &msg) void GuildHandler::processGuildExpulsion(Net::MessageIn &msg) { - const std::string nick = msg.readString(24, "name"); - msg.readString(40, "reason"); - msg.readString(24, "kicker name"); + std::string nick; + if (serverFeatures->haveNewGuild()) + { + nick = msg.readString(24, "name"); + msg.readString(40, "reason"); + msg.readString(24, "kicker name"); + } + else + { + msg.readInt16("len?"); + nick = msg.readString(24, "name?"); + msg.skip(24, "player name"); + msg.readString(44, "message"); + } processGuildExpulsionContinue(nick); } |