dahjah/hostile-takeover
1
0
Fork 0
mirror of https://github.com/spiffcode/hostile-takeover.git synced 2026-04-07 19:11:26 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use a username with whispers and mod chats

Browse Source 
“username to username:” or “username to mods:” was originally prefixed
to the chat and then the whole string was sent as a server message.
Now, “username to username:” is considered the user’s name for the
chat. This way, clients will process it as a user chat instead of a
server message (this results in the client coloring the chat
differently).
This commit is contained in:
Nathan Fulton 2016-03-15 13:32:25 -04:00
parent 40d0e9ff29
commit 066e2a4839
1 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
server/endpoint.cpp
View File

@ -1237,9 +1237,9 @@ bool Endpoint::ProcessCommand(const char *chat, std::string *response) {
std::string dummy;
const char *rest;
if (GetArgument(chat, 0, &dummy, &rest) && *rest != 0) {
const char *s = base::Format::ToString("%s to mods: %s",
name_, rest);
server_.lobby().SendAdminChat("", s, true);
const char *s = base::Format::ToString("%s to mods",
name_);
server_.lobby().SendAdminChat(s, rest, true);
}
}
*response = "";
@ -1254,23 +1254,31 @@ bool Endpoint::ProcessCommand(const char *chat, std::string *response) {
std::string dummy;
const char *rest;
if (GetArgument(chat, 1, &dummy, &rest) && *rest != 0) {
const char *s = base::Format::ToString("%s to %s: %s",
name_, endpoint->name(), rest);
const char *s = base::Format::ToString("%s to %s",
name_, endpoint->name());
if (endpoint->state_ == ES_GAME) {
endpoint->xpump().Send(
XMsgGameReceiveChat::ToBuffer("", s));
XMsgGameReceiveChat::ToBuffer(s, rest));
}
if (endpoint->state_ == ES_ROOM) {
endpoint->xpump().Send(
XMsgRoomReceiveChat::ToBuffer("", s));
XMsgRoomReceiveChat::ToBuffer(s, rest));
}
server_.logger().LogSystemMsg(this, s);
if (endpoint != this) {
*response = s;
return true;
if (this->state_ == ES_GAME) {
this->xpump().Send(
XMsgGameReceiveChat::ToBuffer(s, rest));
}
if (this->state_ == ES_ROOM) {
this->xpump().Send(
XMsgRoomReceiveChat::ToBuffer(s, rest));
}
}
server_.logger().LogSystemMsg(this, base::Format::ToString(
"%s: %s", s, rest));
}
*response = "";
return true;
}
break;