diff options
| author | David Athay <ko2fan@gmail.com> | 2008-04-03 10:02:00 +0000 |
|---|---|---|
| committer | David Athay <ko2fan@gmail.com> | 2008-04-03 10:02:00 +0000 |
| commit | b2f7f15bfe74361ad86e9ec6fb14ad6b434083c4 (patch) | |
| tree | 478dfaded3d5a94eb704089684757ddac479dacd | |
| parent | 7d05004c8264eeee8aa1e9a5f0bc6a1126bc793a (diff) | |
| download | manaserv-b2f7f15bfe74361ad86e9ec6fb14ad6b434083c4.tar.gz manaserv-b2f7f15bfe74361ad86e9ec6fb14ad6b434083c4.tar.bz2 manaserv-b2f7f15bfe74361ad86e9ec6fb14ad6b434083c4.tar.xz manaserv-b2f7f15bfe74361ad86e9ec6fb14ad6b434083c4.zip | |
Fixed accepting guild invites
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | src/chat-server/chathandler.cpp | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -1,3 +1,7 @@ +2008-04-02 David Athay <ko2fan@gmail.com> + + * src/chat-server/chathandler.cpp: Fix accepting guild invites. + 2008-04-01 David Athay <ko2fan@gmail.com> * src/account-server/dalstorage.cpp, diff --git a/src/chat-server/chathandler.cpp b/src/chat-server/chathandler.cpp index d6a21ca9..0ec9ba39 100644 --- a/src/chat-server/chathandler.cpp +++ b/src/chat-server/chathandler.cpp @@ -654,12 +654,12 @@ void ChatHandler::handleGuildAcceptInvite(ChatClient &client, MessageIn &msg) { MessageOut reply(CPMSG_GUILD_ACCEPT_RESPONSE); - short guildId = msg.readShort(); + std::string guildName = msg.readString(); // check guild exists and that member was invited // then add them as guild member // and remove from invite list - Guild *guild = guildManager->findById(guildId); + Guild *guild = guildManager->findByName(guildName); if (guild) { if (guild->checkInvited(client.characterName)) |