refine edge cases handling to keynums/keystrings,

[xonotic/darkplaces.git] / cl_main.c

diff --git a/cl_main.c b/cl_main.c
index 3d6e1b2672fc6b2aa9dd83d9323712469de43538..a403f3e6ba377a081bdb91a359a715834c830c03 100644 (file)
--- a/cl_main.c
+++ b/cl_main.c
@@ -600,6 +600,7 @@ void CL_EstablishConnection(const char *address, int firstarg)
 #ifdef CONFIG_MENU
                M_Update_Return_Reason("Trying to connect...");
 #endif
+               SCR_BeginLoadingPlaque(false);
        }
        else
        {
@@ -2813,6 +2814,11 @@ double CL_Frame (double time)
        SndSys_SendKeyEvents();
        Sys_SendKeyEvents();
 
+       /*
+        * If the accumulator hasn't become positive, don't
+        * run the frame. Everything that happens before this
+        * point will happen even if we're sleeping this frame.
+        */
        if((cl_timer += time) < 0)
                return cl_timer;
 
@@ -3134,7 +3140,7 @@ void CL_Init (void)
 
                CL_Video_Init();
 
-               NetConn_UpdateSockets_Client();
+               Cvar_Callback(&cl_netport);
 
                host.hook.ConnectLocal = CL_EstablishConnection_Local;
                host.hook.Disconnect = CL_DisconnectEx;