mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r1185) -Fix: [Network] Send to team now results in correct company on the sender

release/0.4.5
truelight 2004-12-20 15:26:19 +00:00
parent 36ce6a7e4f
commit 7460764d91
1 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
network_server.c
View File

@ -945,32 +945,41 @@ void NetworkServer_HandleChat(NetworkAction action, DestType desttype, int dest,
bool show_local = true; // If this is false, the message is already displayed bool show_local = true; // If this is false, the message is already displayed
// on the client who did sent it. // on the client who did sent it.
/* Find all clients that belong to this player */ /* Find all clients that belong to this player */
ci_to = NULL;
FOR_ALL_CLIENTS(cs) { FOR_ALL_CLIENTS(cs) {
ci = DEREF_CLIENT_INFO(cs); ci = DEREF_CLIENT_INFO(cs);
if (ci->client_playas == dest) { if (ci->client_playas == dest) {
SEND_COMMAND(PACKET_SERVER_CHAT)(cs, action, from_index, false, msg); SEND_COMMAND(PACKET_SERVER_CHAT)(cs, action, from_index, false, msg);
if (cs->index == from_index) if (cs->index == from_index) {
show_local = false; show_local = false;
}
ci_to = ci; // Remember a client that is in the company for company-name
} }
} }
ci = NetworkFindClientInfoFromIndex(from_index); ci = NetworkFindClientInfoFromIndex(from_index);
ci_own = NetworkFindClientInfoFromIndex(NETWORK_SERVER_INDEX); ci_own = NetworkFindClientInfoFromIndex(NETWORK_SERVER_INDEX);
if (ci != NULL && ci_own != NULL && ci_own->client_playas == dest) { if (ci != NULL && ci_own != NULL && ci_own->client_playas == dest) {
NetworkTextMessage(action, GetDrawStringPlayerColor(ci->client_playas-1), false, ci->client_name, "%s", msg); NetworkTextMessage(action, GetDrawStringPlayerColor(ci->client_playas-1), false, ci->client_name, "%s", msg);
if (from_index == NETWORK_SERVER_INDEX) if (from_index == NETWORK_SERVER_INDEX)
show_local = false; show_local = false;
ci_to = ci;
} }
/* There is no such player */
if (ci_to == NULL)
break;
// Display the message locally (so you know you have sent it) // Display the message locally (so you know you have sent it)
if (ci != NULL && show_local) { if (ci != NULL && show_local) {
if (from_index == NETWORK_SERVER_INDEX) { if (from_index == NETWORK_SERVER_INDEX) {
char name[NETWORK_NAME_LENGTH]; char name[NETWORK_NAME_LENGTH];
GetString(name, DEREF_PLAYER(ci->client_playas-1)->name_1); GetString(name, DEREF_PLAYER(ci_to->client_playas-1)->name_1);
NetworkTextMessage(action, GetDrawStringPlayerColor(ci->client_playas-1), true, name, "%s", msg); NetworkTextMessage(action, GetDrawStringPlayerColor(ci_own->client_playas-1), true, name, "%s", msg);
} else { } else {
FOR_ALL_CLIENTS(cs) { FOR_ALL_CLIENTS(cs) {
if (cs->index == from_index) { if (cs->index == from_index) {
SEND_COMMAND(PACKET_SERVER_CHAT)(cs, action, from_index, true, msg); SEND_COMMAND(PACKET_SERVER_CHAT)(cs, action, dest, true, msg);
} }
} }
} }