diff options
| author | David Athay <ko2fan@gmail.com> | 2008-04-28 17:18:00 +0000 |
|---|---|---|
| committer | David Athay <ko2fan@gmail.com> | 2008-04-28 17:18:00 +0000 |
| commit | 7802bc28e08c7660ffa524683911eba58099e9db (patch) | |
| tree | b7dc571f2fb3b41f5066548ef5a213035658447b | |
| parent | 19d8859a9c997591d8e0fbbda745da7258104eee (diff) | |
| download | manaserv-7802bc28e08c7660ffa524683911eba58099e9db.tar.gz manaserv-7802bc28e08c7660ffa524683911eba58099e9db.tar.bz2 manaserv-7802bc28e08c7660ffa524683911eba58099e9db.tar.xz manaserv-7802bc28e08c7660ffa524683911eba58099e9db.zip | |
Added sending who accepted invite on invite response to client
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | accountserver.cbp | 4 | ||||
| -rw-r--r-- | src/chat-server/chathandler.cpp | 1 | ||||
| -rw-r--r-- | src/defines.h | 2 |
4 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,8 @@ +2008-04-28 David Athay <ko2fan@gmail.com> + + * src/chat-server/chathandler.cpp, src/defines.h, accountserver.cbp: + Added sending who accepted invite on invite response to client. + 2008-04_23 Yohann Ferreira <bertram@cegetel.net> * src/account-server/accounthandler.cpp, src/defines.h: Realigned diff --git a/accountserver.cbp b/accountserver.cbp index 2e2ef005..44758ed3 100644 --- a/accountserver.cbp +++ b/accountserver.cbp @@ -108,6 +108,8 @@ <Unit filename="src/utils/base64.h" /> <Unit filename="src/utils/cipher.cpp" /> <Unit filename="src/utils/cipher.h" /> + <Unit filename="src/utils/encryption.cpp" /> + <Unit filename="src/utils/encryption.h" /> <Unit filename="src/utils/functors.h" /> <Unit filename="src/utils/logger.cpp" /> <Unit filename="src/utils/logger.h" /> @@ -115,6 +117,8 @@ <Unit filename="src/utils/mathutils.h" /> <Unit filename="src/utils/processorutils.cpp" /> <Unit filename="src/utils/processorutils.hpp" /> + <Unit filename="src/utils/sha256.cpp" /> + <Unit filename="src/utils/sha256.h" /> <Unit filename="src/utils/singleton.h" /> <Unit filename="src/utils/stringfilter.cpp" /> <Unit filename="src/utils/stringfilter.h" /> diff --git a/src/chat-server/chathandler.cpp b/src/chat-server/chathandler.cpp index 6f7fac9c..423ee743 100644 --- a/src/chat-server/chathandler.cpp +++ b/src/chat-server/chathandler.cpp @@ -935,6 +935,7 @@ bool ChatHandler::handlePartyJoin(const std::string &invited, const std::string c1->party->addUser(invited); c2->party = c1->party; // was successful so return success to inviter + out.writeString(invited); out.writeByte(ERRMSG_OK); c1->send(out); return true; diff --git a/src/defines.h b/src/defines.h index 640eb9bc..17cafca1 100644 --- a/src/defines.h +++ b/src/defines.h @@ -202,7 +202,7 @@ enum { // Party PCMSG_PARTY_INVITE = 0x03A0, // S name - CPMSG_PARTY_INVITE_RESPONSE = 0x03A1, // B error + CPMSG_PARTY_INVITE_RESPONSE = 0x03A1, // B error, S name CPMSG_PARTY_INVITED = 0x03A2, // S name PCMSG_PARTY_ACCEPT_INVITE = 0x03A5, // S name CPMSG_PARTY_ACCEPT_INVITE_RESPONSE = 0x03A6, // B error |