(svn r16555) -Feature [FS#570]: ability to enter server and company password via command line when joining a server (based on patch by Progman, Ammler and planetmaker)

1 files changed, 3 insertions, 1 deletions

diff --git a/src/network/network.cpp b/src/network/network.cpp
index 90f048b2c..7646278ca 100644
--- a/src/network/network.cpp
+++ b/src/network/network.cpp
@@ -720,7 +720,7 @@ public:
 
 
 /* Used by clients, to connect to a server */
-void NetworkClientConnectGame(NetworkAddress address, CompanyID join_as)
+void NetworkClientConnectGame(NetworkAddress address, CompanyID join_as, const char *join_server_password, const char *join_company_password)
 {
 	if (!_network_available) return;
 
@@ -729,6 +729,8 @@ void NetworkClientConnectGame(NetworkAddress address, CompanyID join_as)
 	strecpy(_settings_client.network.last_host, address.GetHostname(), lastof(_settings_client.network.last_host));
 	_settings_client.network.last_port = address.GetPort();
 	_network_join_as = join_as;
+	_network_join_server_password = join_server_password;
+	_network_join_company_password = join_company_password;
 
 	NetworkDisconnect();
 	NetworkInitialize();