diff options
| author | David Athay <ko2fan@gmail.com> | 2008-04-16 16:02:32 +0000 |
|---|---|---|
| committer | David Athay <ko2fan@gmail.com> | 2008-04-16 16:02:32 +0000 |
| commit | 34e6d6c9c6d13623b9adf00ff19081770c4d9f24 (patch) | |
| tree | 0a09f9898293e62ccc2891c2d29b4581e44ee729 | |
| parent | 0d9ac84ca12fbf0dc1592c9f13d0f4b700743f01 (diff) | |
| download | mana-34e6d6c9c6d13623b9adf00ff19081770c4d9f24.tar.gz mana-34e6d6c9c6d13623b9adf00ff19081770c4d9f24.tar.bz2 mana-34e6d6c9c6d13623b9adf00ff19081770c4d9f24.tar.xz mana-34e6d6c9c6d13623b9adf00ff19081770c4d9f24.zip | |
Removed private channels
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | src/gui/chat.cpp | 2 | ||||
| -rw-r--r-- | src/net/chatserver/chatserver.cpp | 5 | ||||
| -rw-r--r-- | src/net/protocol.h | 6 |
4 files changed, 10 insertions, 5 deletions
@@ -5,6 +5,8 @@ src/gui/guildlistbox.h, src/gui/guildwindow.cpp, src/guild.cpp, src/guild.h, src/net/guildhandler.cpp: Fixed online status so that users are shown as online. + * src/gui/chat.cpp, src/net/protocol.h, + src/net/chatserver/chatserver.cpp: Remove private channels. 2008-04-15 David Athay <ko2fan@gmail.com> diff --git a/src/gui/chat.cpp b/src/gui/chat.cpp index f6e95059..a0e7f036 100644 --- a/src/gui/chat.cpp +++ b/src/gui/chat.cpp @@ -333,7 +333,7 @@ void ChatWindow::chatSend(std::string const &nick, std::string const &msg, else if (command == "register") { chatLog("Requesting to register channel " + arg, BY_SERVER); - Net::ChatServer::registerChannel(arg, "", "", false); + Net::ChatServer::registerChannel(arg, "", ""); } else if (command == "join") { diff --git a/src/net/chatserver/chatserver.cpp b/src/net/chatserver/chatserver.cpp index 67cb5796..9f2c871a 100644 --- a/src/net/chatserver/chatserver.cpp +++ b/src/net/chatserver/chatserver.cpp @@ -81,12 +81,9 @@ void Net::ChatServer::privMsg(const std::string &recipient, } void Net::ChatServer::registerChannel(const std::string &name, - const std::string &announcement, const std::string &password, - char isPrivate) + const std::string &announcement, const std::string &password) { MessageOut msg(PCMSG_REGISTER_CHANNEL); - - msg.writeInt8(isPrivate); msg.writeString(name); msg.writeString(announcement); msg.writeString(password); diff --git a/src/net/protocol.h b/src/net/protocol.h index 79e1f2ca..5aab202c 100644 --- a/src/net/protocol.h +++ b/src/net/protocol.h @@ -147,6 +147,12 @@ enum { CPMSG_GUILD_INVITED = 0x0370, // S char name, S guild name, W id CPMSG_GUILD_REJOIN = 0x0371, // S name, W guild, B rights, W channel + // Party + PCMSG_PARTY_CREATE = 0x03A0, // - + CPMSG_PARTY_CREATE_RESPONSE = 0x03A1, // B error + PCMSG_PARTY_QUIT = 0x03AA, // - + CPMSG_PARTY_QUIT_RESPONSE = 0x03AB, // B error + // Chat CPMSG_ERROR = 0x0401, // B error CPMSG_ANNOUNCEMENT = 0x0402, // S text |