2 files changed, 15 insertions, 15 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
diff --git a/src/net/tmwa/guildhandler.cpp b/src/net/tmwa/guildhandler.cpp
index 9445a4760..24bb06514 100644
--- a/src/net/tmwa/guildhandler.cpp
+++ b/src/net/tmwa/guildhandler.cpp
@@ -342,12 +342,14 @@ 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("emblem");
+    const int posMode =  msg.readInt32("position");
+    msg.readInt32("unused");
+    msg.readUInt8("usused");
+    std::string guildName = msg.readString(24, "guild name");
+
+    PlayerInfo::setGuildPositionFlags(GuildPositionFlags::Invite);
 
     Guild *const g = Guild::getGuild(static_cast<int16_t>(guildId));
     if (!g)