diff options
| author | David Athay <ko2fan@gmail.com> | 2008-07-22 13:47:35 +0000 |
|---|---|---|
| committer | David Athay <ko2fan@gmail.com> | 2008-07-22 13:47:35 +0000 |
| commit | 19a3d8395772b65d0624d2413c2e7e8b845cdb7d (patch) | |
| tree | ce330de2bbbf871a6a8c19763862cc48b4c09741 /src/net | |
| parent | 90b35878719aea081232adbb58fc906a3b3e0f79 (diff) | |
| download | mana-19a3d8395772b65d0624d2413c2e7e8b845cdb7d.tar.gz mana-19a3d8395772b65d0624d2413c2e7e8b845cdb7d.tar.bz2 mana-19a3d8395772b65d0624d2413c2e7e8b845cdb7d.tar.xz mana-19a3d8395772b65d0624d2413c2e7e8b845cdb7d.zip | |
Add permissions to guild members. Alt-Gr fix for Rotonen from 0.0
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/guildhandler.cpp | 12 | ||||
| -rw-r--r-- | src/net/protocol.h | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/net/guildhandler.cpp b/src/net/guildhandler.cpp index 151abe03..51393168 100644 --- a/src/net/guildhandler.cpp +++ b/src/net/guildhandler.cpp @@ -137,19 +137,19 @@ void GuildHandler::handleMessage(MessageIn &msg) guild->addMember(guildMember); guildWindow->setOnline(guild->getName(), guildMember, true); break; - + case GUILD_EVENT_LEAVING_PLAYER: guild->removeMember(guildMember); break; - + case GUILD_EVENT_ONLINE_PLAYER: guildWindow->setOnline(guild->getName(), guildMember, true); break; - + case GUILD_EVENT_OFFLINE_PLAYER: guildWindow->setOnline(guild->getName(), guildMember, false); break; - + default: logger->log("Invalid guild event"); } @@ -201,12 +201,12 @@ void GuildHandler::joinedGuild(MessageIn &msg) { std::string guildName = msg.readString(); short guildId = msg.readInt16(); - bool leader = msg.readInt8(); + short permissions = msg.readInt16(); short channelId = msg.readInt16(); std::string announcement = msg.readString(); // Add guild to player and create new guild tab - Guild *guild = player_node->addGuild(guildId, leader); + Guild *guild = player_node->addGuild(guildId, permissions); guild->setName(guildName); guildWindow->newGuildTab(guildName); guildWindow->requestMemberList(guildId); diff --git a/src/net/protocol.h b/src/net/protocol.h index 89713591..52db350b 100644 --- a/src/net/protocol.h +++ b/src/net/protocol.h @@ -143,7 +143,7 @@ enum { CPMSG_GUILD_QUIT_RESPONSE = 0x0361, // B error CPMSG_GUILD_INVITED = 0x0370, // S char name, S guild name, W id - CPMSG_GUILD_REJOIN = 0x0371, // S name, W guild, B rights, W channel + CPMSG_GUILD_REJOIN = 0x0371, // S name, W guild, W rights, W channel, S announce // Party PCMSG_PARTY_INVITE = 0x03A0, // S name |