about summary refs log tree commit diff
path: root/src/engine/client
diff options
context:
space:
mode:
authorMagnus Auvinen <magnus.auvinen@gmail.com>2007-07-21 21:28:56 +0000
committerMagnus Auvinen <magnus.auvinen@gmail.com>2007-07-21 21:28:56 +0000
commit9ef96af0545ed33e326bb863fb740705dd0b17c5 (patch)
tree7d98f1f67d1d7ed4514dfa73de016339dd42c028 /src/engine/client
parent4229cee5040516a5968a22549a40050c4739e1ba (diff)
downloadzcatch-9ef96af0545ed33e326bb863fb740705dd0b17c5.tar.gz
zcatch-9ef96af0545ed33e326bb863fb740705dd0b17c5.zip
fixed alot of masterserver fixes
Diffstat (limited to 'src/engine/client')
-rw-r--r--src/engine/client/client.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/engine/client/client.cpp b/src/engine/client/client.cpp
index 56a7f5d9..8d7fb1e2 100644
--- a/src/engine/client/client.cpp
+++ b/src/engine/client/client.cpp
@@ -417,7 +417,7 @@ public:
 		net.open(0, 0);
 		
 		//
-		net_host_lookup(MASTERSERVER_ADDRESS, MASTERSERVER_PORT, &master_server);
+		net_host_lookup(config.masterserver, MASTERSERVER_PORT, &master_server);
 
 		// connect to the server if wanted
 		if(direct_connect_server)
@@ -576,6 +576,9 @@ public:
 					sprintf(servers.infos[i].address, "%d.%d.%d.%d:%d",
 						servers.addresses[i].ip[0], servers.addresses[i].ip[1], servers.addresses[i].ip[2],
 						servers.addresses[i].ip[3], servers.addresses[i].port);
+					sprintf(servers.infos[i].name, "%d.%d.%d.%d:%d",
+						servers.addresses[i].ip[0], servers.addresses[i].ip[1], servers.addresses[i].ip[2],
+						servers.addresses[i].ip[3], servers.addresses[i].port);
 				}
 			}