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

(svn r21350) -Fix: some indentation

release/1.1
rubidium 2010-11-28 22:45:47 +00:00
parent 2b258feee7
commit c60a850fed
1 changed files with 88 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

176
src/network/network_server.cpp
View File

@ -1002,109 +1002,109 @@ void NetworkServerSendChat(NetworkAction action, DestType desttype, int dest, co
const NetworkClientInfo *ci, *ci_own, *ci_to; const NetworkClientInfo *ci, *ci_own, *ci_to;
switch (desttype) { switch (desttype) {
case DESTTYPE_CLIENT: case DESTTYPE_CLIENT:
/* Are we sending to the server? */ /* Are we sending to the server? */
if ((ClientID)dest == CLIENT_ID_SERVER) { if ((ClientID)dest == CLIENT_ID_SERVER) {
ci = NetworkFindClientInfoFromClientID(from_id);
/* Display the text locally, and that is it */
if (ci != NULL) {
NetworkTextMessage(action, (ConsoleColour)GetDrawStringCompanyColour(ci->client_playas), false, ci->client_name, msg, data);
if (_settings_client.network.server_admin_chat) {
NetworkAdminChat(action, desttype, from_id, msg, data, from_admin);
}
}
} else {
/* Else find the client to send the message to */
FOR_ALL_CLIENT_SOCKETS(cs) {
if (cs->client_id == (ClientID)dest) {
cs->SendChat(action, from_id, false, msg, data);
break;
}
}
}
/* Display the message locally (so you know you have sent it) */
if (from_id != (ClientID)dest) {
if (from_id == CLIENT_ID_SERVER) {
ci = NetworkFindClientInfoFromClientID(from_id); ci = NetworkFindClientInfoFromClientID(from_id);
ci_to = NetworkFindClientInfoFromClientID((ClientID)dest); /* Display the text locally, and that is it */
if (ci != NULL && ci_to != NULL) { if (ci != NULL) {
NetworkTextMessage(action, (ConsoleColour)GetDrawStringCompanyColour(ci->client_playas), true, ci_to->client_name, msg, data); NetworkTextMessage(action, (ConsoleColour)GetDrawStringCompanyColour(ci->client_playas), false, ci->client_name, msg, data);
if (_settings_client.network.server_admin_chat) {
NetworkAdminChat(action, desttype, from_id, msg, data, from_admin);
}
} }
} else { } else {
/* Else find the client to send the message to */
FOR_ALL_CLIENT_SOCKETS(cs) { FOR_ALL_CLIENT_SOCKETS(cs) {
if (cs->client_id == from_id) { if (cs->client_id == (ClientID)dest) {
cs->SendChat(action, (ClientID)dest, true, msg, data); cs->SendChat(action, from_id, false, msg, data);
break; break;
} }
} }
} }
}
break;
case DESTTYPE_TEAM: {
/* If this is false, the message is already displayed on the client who sent it. */
bool show_local = true;
/* Find all clients that belong to this company */
ci_to = NULL;
FOR_ALL_CLIENT_SOCKETS(cs) {
ci = cs->GetInfo();
if (ci->client_playas == (CompanyID)dest) {
cs->SendChat(action, from_id, false, msg, data);
if (cs->client_id == from_id) show_local = false;
ci_to = ci; // Remember a client that is in the company for company-name
}
}
/* if the server can read it, let the admin network read it, too. */ /* Display the message locally (so you know you have sent it) */
if (_local_company == (CompanyID)dest && _settings_client.network.server_admin_chat) { if (from_id != (ClientID)dest) {
NetworkAdminChat(action, desttype, from_id, msg, data, from_admin); if (from_id == CLIENT_ID_SERVER) {
} ci = NetworkFindClientInfoFromClientID(from_id);
ci_to = NetworkFindClientInfoFromClientID((ClientID)dest);
ci = NetworkFindClientInfoFromClientID(from_id); if (ci != NULL && ci_to != NULL) {
ci_own = NetworkFindClientInfoFromClientID(CLIENT_ID_SERVER); NetworkTextMessage(action, (ConsoleColour)GetDrawStringCompanyColour(ci->client_playas), true, ci_to->client_name, msg, data);
if (ci != NULL && ci_own != NULL && ci_own->client_playas == dest) { }
NetworkTextMessage(action, (ConsoleColour)GetDrawStringCompanyColour(ci->client_playas), false, ci->client_name, msg, data); } else {
if (from_id == CLIENT_ID_SERVER) show_local = false; FOR_ALL_CLIENT_SOCKETS(cs) {
ci_to = ci_own; if (cs->client_id == from_id) {
} cs->SendChat(action, (ClientID)dest, true, msg, data);
break;
/* There is no such client */ }
if (ci_to == NULL) break;
/* Display the message locally (so you know you have sent it) */
if (ci != NULL && show_local) {
if (from_id == CLIENT_ID_SERVER) {
char name[NETWORK_NAME_LENGTH];
StringID str = Company::IsValidID(ci_to->client_playas) ? STR_COMPANY_NAME : STR_NETWORK_SPECTATORS;
SetDParam(0, ci_to->client_playas);
GetString(name, str, lastof(name));
NetworkTextMessage(action, (ConsoleColour)GetDrawStringCompanyColour(ci_own->client_playas), true, name, msg, data);
} else {
FOR_ALL_CLIENT_SOCKETS(cs) {
if (cs->client_id == from_id) {
cs->SendChat(action, ci_to->client_id, true, msg, data);
} }
} }
} }
} break;
break; case DESTTYPE_TEAM: {
} /* If this is false, the message is already displayed on the client who sent it. */
default: bool show_local = true;
DEBUG(net, 0, "[server] received unknown chat destination type %d. Doing broadcast instead", desttype); /* Find all clients that belong to this company */
/* FALL THROUGH */ ci_to = NULL;
case DESTTYPE_BROADCAST: FOR_ALL_CLIENT_SOCKETS(cs) {
FOR_ALL_CLIENT_SOCKETS(cs) { ci = cs->GetInfo();
cs->SendChat(action, from_id, false, msg, data); if (ci->client_playas == (CompanyID)dest) {
} cs->SendChat(action, from_id, false, msg, data);
if (cs->client_id == from_id) show_local = false;
ci_to = ci; // Remember a client that is in the company for company-name
}
}
NetworkAdminChat(action, desttype, from_id, msg, data, from_admin); /* if the server can read it, let the admin network read it, too. */
if (_local_company == (CompanyID)dest && _settings_client.network.server_admin_chat) {
NetworkAdminChat(action, desttype, from_id, msg, data, from_admin);
}
ci = NetworkFindClientInfoFromClientID(from_id); ci = NetworkFindClientInfoFromClientID(from_id);
if (ci != NULL) { ci_own = NetworkFindClientInfoFromClientID(CLIENT_ID_SERVER);
NetworkTextMessage(action, (ConsoleColour)GetDrawStringCompanyColour(ci->client_playas), false, ci->client_name, msg, data); if (ci != NULL && ci_own != NULL && ci_own->client_playas == dest) {
NetworkTextMessage(action, (ConsoleColour)GetDrawStringCompanyColour(ci->client_playas), false, ci->client_name, msg, data);
if (from_id == CLIENT_ID_SERVER) show_local = false;
ci_to = ci_own;
}
/* There is no such client */
if (ci_to == NULL) break;
/* Display the message locally (so you know you have sent it) */
if (ci != NULL && show_local) {
if (from_id == CLIENT_ID_SERVER) {
char name[NETWORK_NAME_LENGTH];
StringID str = Company::IsValidID(ci_to->client_playas) ? STR_COMPANY_NAME : STR_NETWORK_SPECTATORS;
SetDParam(0, ci_to->client_playas);
GetString(name, str, lastof(name));
NetworkTextMessage(action, (ConsoleColour)GetDrawStringCompanyColour(ci_own->client_playas), true, name, msg, data);
} else {
FOR_ALL_CLIENT_SOCKETS(cs) {
if (cs->client_id == from_id) {
cs->SendChat(action, ci_to->client_id, true, msg, data);
}
}
}
}
break;
} }
break; default:
DEBUG(net, 0, "[server] received unknown chat destination type %d. Doing broadcast instead", desttype);
/* FALL THROUGH */
case DESTTYPE_BROADCAST:
FOR_ALL_CLIENT_SOCKETS(cs) {
cs->SendChat(action, from_id, false, msg, data);
}
NetworkAdminChat(action, desttype, from_id, msg, data, from_admin);
ci = NetworkFindClientInfoFromClientID(from_id);
if (ci != NULL) {
NetworkTextMessage(action, (ConsoleColour)GetDrawStringCompanyColour(ci->client_playas), false, ci->client_name, msg, data);
}
break;
} }
} }