summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrubidium <rubidium@openttd.org>2008-07-17 12:02:09 +0000
committerrubidium <rubidium@openttd.org>2008-07-17 12:02:09 +0000
commitc913be73d8dc69910b67f095aa3820ba29e6bf51 (patch)
treeebcf2129e563dba0fc89c43b32843460fc0f826e
parent60a658259066dae496a60e80f1aaa335dff54e05 (diff)
downloadopenttd-c913be73d8dc69910b67f095aa3820ba29e6bf51.tar.xz
(svn r13714) -Fix: remove the unique_id from the message that a client has joined as it is only exposes the unique_id more than needed. Patch by dih.
-rw-r--r--src/network/network_client.cpp3
-rw-r--r--src/network/network_server.cpp2
2 files changed, 0 insertions, 5 deletions
diff --git a/src/network/network_client.cpp b/src/network/network_client.cpp
index cd2df7f23..0b52e0169 100644
--- a/src/network/network_client.cpp
+++ b/src/network/network_client.cpp
@@ -400,10 +400,8 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_CLIENT_INFO)
uint16 index = p->Recv_uint16();
PlayerID playas = (Owner)p->Recv_uint8();
char name[NETWORK_NAME_LENGTH];
- char unique_id[NETWORK_UNIQUE_ID_LENGTH];
p->Recv_string(name, sizeof(name));
- p->Recv_string(unique_id, sizeof(unique_id));
if (MY_CLIENT->has_quit) return NETWORK_RECV_STATUS_CONN_LOST;
@@ -435,7 +433,6 @@ DEF_CLIENT_RECEIVE_COMMAND(PACKET_SERVER_CLIENT_INFO)
ci->client_playas = playas;
ttd_strlcpy(ci->client_name, name, sizeof(ci->client_name));
- ttd_strlcpy(ci->unique_id, unique_id, sizeof(ci->unique_id));
InvalidateWindow(WC_CLIENT_LIST, 0);
diff --git a/src/network/network_server.cpp b/src/network/network_server.cpp
index 6cbfe21ba..2e0de667a 100644
--- a/src/network/network_server.cpp
+++ b/src/network/network_server.cpp
@@ -49,7 +49,6 @@ DEF_SERVER_SEND_COMMAND_PARAM(PACKET_SERVER_CLIENT_INFO)(NetworkTCPSocketHandler
// uint16: The index of the client (always unique on a server. 1 = server)
// uint8: As which player the client is playing
// String: The name of the client
- // String: The unique id of the client
//
if (ci->client_index != NETWORK_EMPTY_INDEX) {
@@ -57,7 +56,6 @@ DEF_SERVER_SEND_COMMAND_PARAM(PACKET_SERVER_CLIENT_INFO)(NetworkTCPSocketHandler
p->Send_uint16(ci->client_index);
p->Send_uint8 (ci->client_playas);
p->Send_string(ci->client_name);
- p->Send_string(ci->unique_id);
cs->Send_Packet(p);
}