X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=netconn.c;h=ac481ca6df030e6d3d602ce11f0885880ab81b72;hb=4d34e0a632cbc401712f46e10bb9864438b0881f;hp=af1aae28eab4c3b8e15297ed96206ef3473f894d;hpb=1b92049622062956a04f1766f66f072350773acb;p=xonotic%2Fdarkplaces.git

diff --git a/netconn.c b/netconn.c
index af1aae28..ac481ca6 100755
--- a/netconn.c
+++ b/netconn.c
@@ -1529,7 +1529,7 @@ static void NetConn_ConnectionEstablished(lhnetsocket_t *mysocket, lhnetaddress_
 #endif
 	// Disconnect from the current server or stop demo playback
 	if(cls.state == ca_connected || cls.demoplayback)
-		CL_Disconnect();
+		CL_Disconnect(false, NULL);
 	// allocate a net connection to keep track of things
 	cls.netcon = NetConn_Open(mysocket, peeraddress);
 	crypto = &cls.netcon->crypto;
@@ -2488,10 +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();
-	}
+		CL_Disconnect(true, "Connection timed out");
 }
 
 static void NetConn_BuildChallengeString(char *buffer, int bufferlength)
@@ -3903,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);