X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=netconn.c;h=98d26019e0cc388918e0ded10da13bf22fc925f1;hp=32fb1f35000229956fddc63b45550838526cc524;hb=7ea07939bef0cbe85c54d9f68cb924198b0b1f64;hpb=775c0f6d056c37d2e23f9a96ec827023fe5e3404

diff --git a/netconn.c b/netconn.c
index 32fb1f35..98d26019 100755
--- a/netconn.c
+++ b/netconn.c
@@ -1527,13 +1527,7 @@ static void NetConn_ConnectionEstablished(lhnetsocket_t *mysocket, lhnetaddress_
 #ifdef CONFIG_MENU
 	M_Update_Return_Reason("");
 #endif
-	// if we're connecting to a remote server, shut down any local server
-	if (LHNETADDRESS_GetAddressType(peeraddress) != LHNETADDRESSTYPE_LOOP && sv.active)
-	{
-		SV_LockThreadMutex();
-		SV_Shutdown ();
-		SV_UnlockThreadMutex();
-	}
+	// Disconnect from the current server or stop demo playback
 	if(cls.state == ca_connected || cls.demoplayback)
 		CL_Disconnect();
 	// allocate a net connection to keep track of things
@@ -2494,13 +2488,7 @@ void NetConn_ClientFrame(void)
 	NetConn_QueryQueueFrame();
 #endif
 	if (cls.netcon && host.realtime > cls.netcon->timeout && !sv.active)
-	{
-		Con_Print("Connection timed out\n");
-		CL_Disconnect();
-		SV_LockThreadMutex();
-		SV_Shutdown ();
-		SV_UnlockThreadMutex();
-	}
+		CL_DisconnectEx(true, "Connection timed out");
 }
 
 static void NetConn_BuildChallengeString(char *buffer, int bufferlength)
@@ -3912,9 +3900,9 @@ void NetConn_Init(void)
 	Cvar_RegisterVariable(&net_fakelag);
 	Cvar_RegisterVariable(&net_fakeloss_send);
 	Cvar_RegisterVariable(&net_fakeloss_receive);
-	Cvar_RegisterAlias(&net_fakelag, "cl_netlocalping");
-	Cvar_RegisterAlias(&net_fakeloss_send, "cl_netpacketloss_send");
-	Cvar_RegisterAlias(&net_fakeloss_receive, "cl_netpacketloss_receive");
+	Cvar_RegisterVirtual(&net_fakelag, "cl_netlocalping");
+	Cvar_RegisterVirtual(&net_fakeloss_send, "cl_netpacketloss_send");
+	Cvar_RegisterVirtual(&net_fakeloss_receive, "cl_netpacketloss_receive");
 	Cvar_RegisterVariable(&hostname);
 	Cvar_RegisterVariable(&developer_networking);
 	Cvar_RegisterVariable(&cl_netport);