X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=cl_main.c;h=fe1840aff42db97cb43db2ec931f381da739312b;hb=901c2dc4c18988e81b88cd9ff8573b35702ceec7;hp=e4d56733a18ba40c7f93b5ce241f1d1e35b2b46f;hpb=0706fdfa8e33548670e59234409eac2c51849631;p=xonotic%2Fdarkplaces.git

diff --git a/cl_main.c b/cl_main.c
index e4d56733..fe1840af 100644
--- a/cl_main.c
+++ b/cl_main.c
@@ -107,6 +107,10 @@ cvar_t cl_maxfps = {CF_CLIENT | CF_ARCHIVE, "cl_maxfps", "0", "maximum fps cap,
 cvar_t cl_maxfps_alwayssleep = {CF_CLIENT | CF_ARCHIVE, "cl_maxfps_alwayssleep","1", "gives up some processing time to other applications each frame, value in milliseconds, disabled if cl_maxfps is 0"};
 cvar_t cl_maxidlefps = {CF_CLIENT | CF_ARCHIVE, "cl_maxidlefps", "20", "maximum fps cap when the game is not the active window (makes cpu time available to other programs"};
 
+cvar_t cl_areagrid_link_SOLID_NOT = {CF_CLIENT, "cl_areagrid_link_SOLID_NOT", "1", "set to 0 to prevent SOLID_NOT entities from being linked to the area grid, and unlink any that are already linked (in the code paths that would otherwise link them), for better performance"};
+cvar_t cl_gameplayfix_nudgeoutofsolid_separation = {CF_CLIENT, "cl_gameplayfix_nudgeoutofsolid_separation", "0.03125", "keep objects this distance apart to prevent collision issues on seams"};
+
+
 client_static_t	cls;
 client_state_t	cl;
 
@@ -360,7 +364,8 @@ Sends a disconnect message to the server
 This is also called on Host_Error, so it shouldn't cause any errors
 =====================
 */
-void CL_Disconnect(qbool kicked, const char *fmt, ... )
+
+void CL_DisconnectEx(qbool kicked, const char *fmt, ... )
 {
 	va_list argptr;
 	char reason[512];
@@ -386,11 +391,13 @@ void CL_Disconnect(qbool kicked, const char *fmt, ... )
 
 	Con_DPrintf("CL_Disconnect\n");
 
-    Cvar_SetValueQuick(&csqc_progcrc, -1);
+	Cvar_SetValueQuick(&csqc_progcrc, -1);
 	Cvar_SetValueQuick(&csqc_progsize, -1);
 	CL_VM_ShutDown();
-// stop sounds (especially looping!)
-	S_StopAllSounds ();
+	// stop sounds (especially looping!)
+	S_StopAllSounds();
+	// prevent dlcache assets from this server from interfering with the next one
+	FS_UnloadPacks_dlcache();
 
 	cl.parsingtextexpectingpingforscores = 0; // just in case no reply has come yet
 
@@ -460,6 +467,11 @@ void CL_Disconnect(qbool kicked, const char *fmt, ... )
 		host.hook.SV_Shutdown();
 }
 
+void CL_Disconnect(void)
+{
+	CL_DisconnectEx(false, NULL);
+}
+
 /*
 ==================
 CL_Reconnect_f
@@ -538,7 +550,7 @@ static void CL_Connect_f(cmd_state_t *cmd)
 
 void CL_Disconnect_f(cmd_state_t *cmd)
 {
-	CL_Disconnect(false, Cmd_Argc(cmd) > 1 ? Cmd_Argv(cmd, 1) : NULL);
+	Cmd_Argc(cmd) < 1 ? CL_Disconnect() : CL_DisconnectEx(false, Cmd_Argv(cmd, 1));
 }
 
 
@@ -592,6 +604,7 @@ void CL_EstablishConnection(const char *address, int firstarg)
 #ifdef CONFIG_MENU
 		M_Update_Return_Reason("Trying to connect...");
 #endif
+		SCR_BeginLoadingPlaque(false);
 	}
 	else
 	{
@@ -2521,7 +2534,29 @@ static void CL_MeshEntities_Restart(void)
 	}
 }
 
-static void CL_MeshEntities_Init(void)
+static void CL_MeshEntities_Start(void)
+{
+	int i;
+	entity_t *ent;
+	for(i = 0; i < NUM_MESHENTITIES; i++)
+	{
+		ent = cl_meshentities + i;
+		Mod_Mesh_Create(ent->render.model, cl_meshentitynames[i]);
+	}
+}
+
+static void CL_MeshEntities_Shutdown(void)
+{
+	int i;
+	entity_t *ent;
+	for(i = 0; i < NUM_MESHENTITIES; i++)
+	{
+		ent = cl_meshentities + i;
+		Mod_Mesh_Destroy(ent->render.model);
+	}
+}
+
+void CL_MeshEntities_Init(void)
 {
 	int i;
 	entity_t *ent;
@@ -2557,7 +2592,7 @@ static void CL_MeshEntities_Init(void)
 		CL_UpdateRenderEntity(&ent->render);
 	}
 	cl_meshentities[MESH_UI].render.flags = RENDER_NOSELFSHADOW;
-	R_RegisterModule("cl_meshentities", CL_MeshEntities_Restart, CL_MeshEntities_Restart, CL_MeshEntities_Restart, CL_MeshEntities_Restart, CL_MeshEntities_Restart);
+	R_RegisterModule("CL_MeshEntities", CL_MeshEntities_Start, CL_MeshEntities_Shutdown, CL_MeshEntities_Restart, CL_MeshEntities_Restart, CL_MeshEntities_Restart);
 }
 
 void CL_MeshEntities_Scene_Clear(void)
@@ -2579,10 +2614,6 @@ void CL_MeshEntities_Scene_FinalizeRenderEntity(void)
 	VectorCopy(ent->render.model->normalmaxs, ent->render.maxs);
 }
 
-static void CL_MeshEntities_Shutdown(void)
-{
-}
-
 extern cvar_t r_overheadsprites_pushback;
 extern cvar_t r_fullbright_directed_pitch_relative;
 extern cvar_t r_fullbright_directed_pitch;
@@ -2787,6 +2818,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;
 
@@ -2932,7 +2968,7 @@ void CL_Shutdown (void)
 	S_StopAllSounds();
 	
 	// disconnect client from server if active
-	CL_Disconnect(false, NULL);
+	CL_Disconnect();
 	
 	CL_Video_Shutdown();
 
@@ -3102,17 +3138,19 @@ void CL_Init (void)
 		Cvar_RegisterVariable (&cl_maxfps_alwayssleep);
 		Cvar_RegisterVariable (&cl_maxidlefps);
 
+		Cvar_RegisterVariable (&cl_areagrid_link_SOLID_NOT);
+		Cvar_RegisterVariable (&cl_gameplayfix_nudgeoutofsolid_separation);
+
 		CL_Parse_Init();
 		CL_Particles_Init();
 		CL_Screen_Init();
-		CL_MeshEntities_Init();
 
 		CL_Video_Init();
 
-		NetConn_UpdateSockets_Client();
+		Cvar_Callback(&cl_netport);
 
 		host.hook.ConnectLocal = CL_EstablishConnection_Local;
-		host.hook.Disconnect = CL_Disconnect;
+		host.hook.Disconnect = CL_DisconnectEx;
 		host.hook.CL_Intermission = CL_Intermission;
 		host.hook.ToggleMenu = CL_ToggleMenu_Hook;
 	}