Mercurial > hg > openttd

changeset 12973:4832983b9344 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
(svn r17467) -Change: show the client id in join messages at the server (patch by dihedral)
author rubidium <rubidium@openttd.org>
date Mon, 07 Sep 2009 21:28:16 +0000
parents f7c10e2e95a2
children 9b86edff7a2e
files src/lang/english.txt src/network/network.cpp src/network/network_server.cpp
diffstat 3 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/src/lang/english.txt
+++ b/src/lang/english.txt
@@ -1732,6 +1732,7 @@
 ############ End of leave-in-this-order
 STR_NETWORK_MESSAGE_CLIENT_LEAVING                              :leaving
 STR_NETWORK_MESSAGE_CLIENT_JOINED                               :*** {RAW_STRING} has joined the game
+STR_NETWORK_MESSAGE_CLIENT_JOINED_ID                            :*** {RAW_STRING} has joined the game (Client #{2:NUM})
 STR_NETWORK_MESSAGE_CLIENT_COMPANY_JOIN                         :*** {RAW_STRING} has joined company #{2:NUM}
 STR_NETWORK_MESSAGE_CLIENT_COMPANY_SPECTATE                     :*** {RAW_STRING} has joined spectators
 STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW                          :*** {RAW_STRING} has started a new company (#{2:NUM})
--- a/src/network/network.cpp
+++ b/src/network/network.cpp
@@ -227,7 +227,10 @@
 			colour = CC_DEFAULT;
 			strid = STR_NETWORK_MESSAGE_CLIENT_COMPANY_NEW;
 			break;
-		case NETWORK_ACTION_JOIN:           strid = STR_NETWORK_MESSAGE_CLIENT_JOINED; break;
+		case NETWORK_ACTION_JOIN:
+			/* Show the Client ID for the server but not for the client. */
+			strid = _network_server ? STR_NETWORK_MESSAGE_CLIENT_JOINED_ID :  STR_NETWORK_MESSAGE_CLIENT_JOINED;
+			break;
 		case NETWORK_ACTION_LEAVE:          strid = STR_NETWORK_MESSAGE_CLIENT_LEFT; break;
 		case NETWORK_ACTION_NAME_CHANGE:    strid = STR_NETWORK_MESSAGE_NAME_CHANGE; break;
 		case NETWORK_ACTION_GIVE_MONEY:     strid = self_send ? STR_NETWORK_MESSAGE_GAVE_MONEY_AWAY : STR_NETWORK_MESSAGE_GIVE_MONEY;   break;
--- a/src/network/network_server.cpp
+++ b/src/network/network_server.cpp
@@ -805,7 +805,7 @@
 
 		NetworkGetClientName(client_name, sizeof(client_name), cs);
 
-		NetworkTextMessage(NETWORK_ACTION_JOIN, CC_DEFAULT, false, client_name);
+		NetworkTextMessage(NETWORK_ACTION_JOIN, CC_DEFAULT, false, client_name, NULL, cs->client_id);
 
 		/* Mark the client as pre-active, and wait for an ACK
 		 *  so we know he is done loading and in sync with us */