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

(svn r6934) -Cleanup: Some minor cleanup for network_client and removing 'stupid' comment

release/0.5
Darkvater 2006-10-24 22:27:10 +00:00
parent 2b8530507d
commit 55cdf3f6ab
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
network_client.c
View File

@ -601,25 +601,22 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_COMMAND)
DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_CHAT) DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_CHAT)
{ {
NetworkAction action = NetworkRecv_uint8(MY_CLIENT, p); char name[NETWORK_NAME_LENGTH], msg[MAX_TEXT_MSG_LEN];
char msg[MAX_TEXT_MSG_LEN];
const NetworkClientInfo *ci = NULL, *ci_to; const NetworkClientInfo *ci = NULL, *ci_to;
uint16 index;
char name[NETWORK_NAME_LENGTH];
bool self_send;
index = NetworkRecv_uint16(MY_CLIENT, p); NetworkAction action = NetworkRecv_uint8(MY_CLIENT, p);
self_send = NetworkRecv_uint8(MY_CLIENT, p); uint16 index = NetworkRecv_uint16(MY_CLIENT, p);
bool self_send = NetworkRecv_uint8(MY_CLIENT, p);
NetworkRecv_string(MY_CLIENT, p, msg, MAX_TEXT_MSG_LEN); NetworkRecv_string(MY_CLIENT, p, msg, MAX_TEXT_MSG_LEN);
ci_to = NetworkFindClientInfoFromIndex(index); ci_to = NetworkFindClientInfoFromIndex(index);
if (ci_to == NULL) return NETWORK_RECV_STATUS_OKAY; if (ci_to == NULL) return NETWORK_RECV_STATUS_OKAY;
/* Do we display the action locally? */ /* Did we initiate the action locally? */
if (self_send) { if (self_send) {
switch (action) { switch (action) {
case NETWORK_ACTION_CHAT_CLIENT: case NETWORK_ACTION_CHAT_CLIENT:
/* For speak to client we need the client-name */ /* For speaking to client we need the client-name */
snprintf(name, sizeof(name), "%s", ci_to->client_name); snprintf(name, sizeof(name), "%s", ci_to->client_name);
ci = NetworkFindClientInfoFromIndex(_network_own_client_index); ci = NetworkFindClientInfoFromIndex(_network_own_client_index);
break; break;
@ -634,10 +631,8 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_CHAT)
GetString(name, str, lastof(name)); GetString(name, str, lastof(name));
ci = NetworkFindClientInfoFromIndex(_network_own_client_index); ci = NetworkFindClientInfoFromIndex(_network_own_client_index);
} break; } break;
default:
/* This should never happen */ default: NOT_REACHED(); break;
NOT_REACHED();
break;
} }
} else { } else {
/* Display message from somebody else */ /* Display message from somebody else */