summaryrefslogtreecommitdiff
path: root/src/net/eathena
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-10-06 21:24:28 +0300
committerAndrei Karas <akaras@inbox.ru>2014-10-06 23:40:01 +0300
commitc623250fbc8524a1ab78791595bf1fc4344fec49 (patch)
treea0a0fb07bf5de4e494d50b214418b1ec99787dce /src/net/eathena
parentff516ba3e0459cce11d6b43d4686a1c3c43a6605 (diff)
downloadmv-c623250fbc8524a1ab78791595bf1fc4344fec49.tar.gz
mv-c623250fbc8524a1ab78791595bf1fc4344fec49.tar.bz2
mv-c623250fbc8524a1ab78791595bf1fc4344fec49.tar.xz
mv-c623250fbc8524a1ab78791595bf1fc4344fec49.zip
read guild position flags.
Diffstat (limited to 'src/net/eathena')
-rw-r--r--src/net/eathena/guildhandler.cpp16
1 files changed, 7 insertions, 9 deletions
diff --git a/src/net/eathena/guildhandler.cpp b/src/net/eathena/guildhandler.cpp
index 03c5a34ef..2d23eaa16 100644
--- a/src/net/eathena/guildhandler.cpp
+++ b/src/net/eathena/guildhandler.cpp
@@ -355,12 +355,13 @@ void GuildHandler::checkMaster() const
void GuildHandler::processGuildPositionInfo(Net::MessageIn &msg) const
{
- const int guildId = msg.readInt32();
- const int emblem = msg.readInt32();
- const int posMode = msg.readInt32();
- msg.readInt32(); // Unused
- msg.readUInt8(); // Unused
- std::string guildName = msg.readString(24);
+ const int guildId = msg.readInt32("guild id");
+ const int emblem = msg.readInt32("elblem id");
+ PlayerInfo::setGuildPositionFlags(
+ static_cast<GuildPositionFlags::Type>(msg.readInt32("mode")));
+ msg.readUInt8("guild master");
+ msg.readInt32("unused");
+ std::string guildName = msg.readString(24, "guild name");
Guild *const g = Guild::getGuild(static_cast<int16_t>(guildId));
if (!g)
@@ -385,9 +386,6 @@ void GuildHandler::processGuildPositionInfo(Net::MessageIn &msg) const
localPlayer->setGuild(g);
localPlayer->setGuildName(g->getName());
}
-
- logger->log("Guild position info: %d %d %d %s\n", guildId,
- emblem, posMode, guildName.c_str());
}
} // namespace EAthena