X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=cl_parse.c;h=ae96302b42cceb6cac3335f0ac661e8af06b5f95;hb=6dca288eb9bac8251395386e6495866e05806f4e;hp=ecd250fc56da0f21100b204b00e5ff74cc9a1232;hpb=2f5dfa4708db4112f682b31146a8db1d456a0482;p=xonotic%2Fdarkplaces.git

diff --git a/cl_parse.c b/cl_parse.c
index ecd250fc..ae96302b 100644
--- a/cl_parse.c
+++ b/cl_parse.c
@@ -184,6 +184,8 @@ cvar_t cl_readpicture_force = {CF_CLIENT, "cl_readpicture_force", "0", "when ena
 #define RIC_GUNSHOTQUAD	2
 cvar_t cl_sound_ric_gunshot = {CF_CLIENT, "cl_sound_ric_gunshot", "0", "specifies if and when the related cl_sound_ric and cl_sound_tink sounds apply to TE_GUNSHOT/TE_GUNSHOTQUAD, 0 = no sound, 1 = TE_GUNSHOT, 2 = TE_GUNSHOTQUAD, 3 = TE_GUNSHOT and TE_GUNSHOTQUAD"};
 cvar_t cl_sound_r_exp3 = {CF_CLIENT, "cl_sound_r_exp3", "weapons/r_exp3.wav", "sound to play during TE_EXPLOSION and related effects (empty cvar disables sound)"};
+cvar_t snd_cdautopause = {CF_CLIENT | CF_ARCHIVE, "snd_cdautopause", "1", "pause the CD track while the game is paused"};
+
 cvar_t cl_serverextension_download = {CF_CLIENT, "cl_serverextension_download", "0", "indicates whether the server supports the download command"};
 cvar_t cl_joinbeforedownloadsfinish = {CF_CLIENT | CF_ARCHIVE, "cl_joinbeforedownloadsfinish", "1", "if non-zero the game will begin after the map is loaded before other downloads finish"};
 cvar_t cl_nettimesyncfactor = {CF_CLIENT | CF_ARCHIVE, "cl_nettimesyncfactor", "0", "rate at which client time adapts to match server time, 1 = instantly, 0.125 = slowly, 0 = not at all (only applied in bound modes 0, 1, 2, 3)"};
@@ -197,6 +199,13 @@ static void QW_CL_NextUpload_f(cmd_state_t *cmd);
 //static qbool QW_CL_IsUploading(void);
 static void QW_CL_StopUpload_f(cmd_state_t *cmd);
 
+static inline void CL_SetSignonStage_WithMsg(int signon_stage)
+{
+	cls.signon = signon_stage;
+	dpsnprintf(cl_connect_status, sizeof(cl_connect_status), "Connect: signon stage %i of %i", cls.signon, SIGNONS);
+	Con_DPrint(cl_connect_status);
+}
+
 /*
 ==================
 CL_ParseStartSoundPacket
@@ -331,10 +340,7 @@ void CL_KeepaliveMessage (qbool readmessages)
 		if(cls.state != ca_dedicated)
 		{
 			if(countdownupdate <= 0) // check if time stepped backwards
-			{
-				SCR_UpdateLoadingScreenIfShown();
 				countdownupdate = 2;
-			}
 		}
 	}
 
@@ -615,7 +621,7 @@ static void QW_CL_RequestNextDownload(void)
 		// if we're still in signon stages, request the next one
 		if (cls.signon != SIGNONS)
 		{
-			cls.signon = SIGNONS-1;
+			CL_SetSignonStage_WithMsg(SIGNONS - 1);
 			// we'll go to SIGNONS when the first entity update is received
 			MSG_WriteByte(&cls.netcon->message, qw_clc_stringcmd);
 			MSG_WriteString(&cls.netcon->message, va(vabuf, sizeof(vabuf), "begin %i", cl.qw_servercount));
@@ -843,7 +849,7 @@ static void QW_CL_ParseModelList(void)
 		return;
 	}
 
-	cls.signon = 2;
+	CL_SetSignonStage_WithMsg(2);
 	cls.qw_downloadnumber = 0;
 	cls.qw_downloadtype = dl_model;
 	QW_CL_RequestNextDownload();
@@ -879,7 +885,7 @@ static void QW_CL_ParseSoundList(void)
 		return;
 	}
 
-	cls.signon = 2;
+	CL_SetSignonStage_WithMsg(2);
 	cls.qw_downloadnumber = 0;
 	cls.qw_downloadtype = dl_sound;
 	QW_CL_RequestNextDownload();
@@ -899,7 +905,7 @@ static void QW_CL_Changing_f(cmd_state_t *cmd)
 
 	S_StopAllSounds();
 	cl.intermission = 0;
-	cls.signon = 1;	// not active anymore, but not disconnected
+	CL_SetSignonStage_WithMsg(1); // not active anymore, but not disconnected
 	Con_Printf("\nChanging map...\n");
 }
 
@@ -1603,8 +1609,10 @@ CL_SignonReply
 An svc_signonnum has been received, perform a client side setup
 =====================
 */
-static void CL_SignonReply (void)
+static void CL_SignonReply(int signon_stage)
 {
+	CL_SetSignonStage_WithMsg(signon_stage);
+
 	Con_DPrintf("CL_SignonReply: %i\n", cls.signon);
 
 	switch (cls.signon)
@@ -1688,8 +1696,11 @@ static void CL_ParseServerInfo (void)
 	{
 		SCR_BeginLoadingPlaque(false);
 		S_StopAllSounds();
+		// prevent dlcache assets from the previous map from interfering with this one
+		FS_UnloadPacks_dlcache();
 		// free q3 shaders so that any newly downloaded shaders will be active
-		Mod_FreeQ3Shaders();
+		// bones_was_here: we free the q3 shaders later in CL_SignonReply
+		//Mod_FreeQ3Shaders();
 	}
 
 	// check memory integrity
@@ -1785,7 +1796,7 @@ static void CL_ParseServerInfo (void)
 		cl.loadfinished = false;
 
 		cls.state = ca_connected;
-		cls.signon = 1;
+		CL_SetSignonStage_WithMsg(1);
 
 		// note: on QW protocol we can't set up the gameworld until after
 		// downloads finish...
@@ -3279,9 +3290,10 @@ extern cvar_t host_timescale;
 extern cvar_t cl_lerpexcess;
 static void CL_NetworkTimeReceived(double newtime)
 {
+	cl.opt_inputs_since_update = 0;
 	cl.mtime[1] = cl.mtime[0];
 	cl.mtime[0] = newtime;
-	if (cl_nolerp.integer || cls.timedemo || cl.mtime[1] == cl.mtime[0] || cls.signon < SIGNONS)
+	if (cls.timedemo || cl.mtime[1] == cl.mtime[0] || cls.signon < SIGNONS)
 		cl.time = cl.mtime[1] = newtime;
 	else if (cls.demoplayback)
 	{
@@ -3304,27 +3316,32 @@ static void CL_NetworkTimeReceived(double newtime)
 				Con_DPrintf("--- cl.time > cl.mtime[0] (%f > %f ... %f)\n", cl.time, cl.mtime[1], cl.mtime[0]);
 		}
 
-		if (cl_nettimesyncboundmode.integer < 4)
-		{
-			// doesn't make sense for modes > 3
-			cl.time += (cl.mtime[1] - cl.time) * bound(0, cl_nettimesyncfactor.value, 1);
-			timehigh = cl.mtime[1] + (cl.mtime[0] - cl.mtime[1]) * cl_nettimesyncboundtolerance.value;
-		}
-
+selectmode:
 		switch (cl_nettimesyncboundmode.integer)
 		{
+		default:
+			Cvar_SetQuick(&cl_nettimesyncboundmode, cl_nettimesyncboundmode.defstring);
+			goto selectmode;
 		case 1:
-			cl.time = bound(cl.mtime[1], cl.time, cl.mtime[0]);
-			break;
-
 		case 2:
-			if (cl.time < cl.mtime[1] || cl.time > timehigh)
-				cl.time = cl.mtime[1];
-			break;
-
 		case 3:
-			if ((cl.time < cl.mtime[1] && cl.oldtime < cl.mtime[1]) || (cl.time > timehigh && cl.oldtime > timehigh))
-				cl.time = cl.mtime[1];
+			// doesn't make sense for modes > 3
+			cl.time += (cl.mtime[1] - cl.time) * bound(0, cl_nettimesyncfactor.value, 1);
+			timehigh = cl.mtime[1] + (cl.mtime[0] - cl.mtime[1]) * cl_nettimesyncboundtolerance.value;
+			switch (cl_nettimesyncboundmode.integer)
+			{
+			case 1:
+				cl.time = bound(cl.mtime[1], cl.time, cl.mtime[0]);
+				break;
+			case 2:
+				if (cl.time < cl.mtime[1] || cl.time > timehigh)
+					cl.time = cl.mtime[1];
+				break;
+			case 3:
+				if ((cl.time < cl.mtime[1] && cl.oldtime < cl.mtime[1]) || (cl.time > timehigh && cl.oldtime > timehigh))
+					cl.time = cl.mtime[1];
+				break;
+			}
 			break;
 
 		case 4:
@@ -3765,20 +3782,14 @@ void CL_ParseServerMessage(void)
 				EntityFrameQW_CL_ReadFrame(false);
 				// first update is the final signon stage
 				if (cls.signon == SIGNONS - 1)
-				{
-					cls.signon = SIGNONS;
-					CL_SignonReply ();
-				}
+					CL_SignonReply(SIGNONS);
 				break;
 
 			case qw_svc_deltapacketentities:
 				EntityFrameQW_CL_ReadFrame(true);
 				// first update is the final signon stage
 				if (cls.signon == SIGNONS - 1)
-				{
-					cls.signon = SIGNONS;
-					CL_SignonReply ();
-				}
+					CL_SignonReply(SIGNONS);
 				break;
 
 			case qw_svc_maxspeed:
@@ -3793,9 +3804,9 @@ void CL_ParseServerMessage(void)
 
 			case qw_svc_setpause:
 				cl.paused = MSG_ReadByte(&cl_message) != 0;
-				if (cl.paused)
+				if (cl.paused && snd_cdautopause.integer)
 					CDAudio_Pause ();
-				else
+				else if (bgmvolume.value > 0.0f)
 					CDAudio_Resume ();
 				S_PauseGameSounds (cl.paused);
 				break;
@@ -3838,11 +3849,8 @@ void CL_ParseServerMessage(void)
 				cmdlogname[cmdindex] = temp;
 				SHOWNET("fast update");
 				if (cls.signon == SIGNONS - 1)
-				{
 					// first update is the final signon stage
-					cls.signon = SIGNONS;
-					CL_SignonReply ();
-				}
+					CL_SignonReply(SIGNONS);
 				EntityFrameQuake_ReadEntity (cmd&127);
 				continue;
 			}
@@ -4120,9 +4128,9 @@ void CL_ParseServerMessage(void)
 
 			case svc_setpause:
 				cl.paused = MSG_ReadByte(&cl_message) != 0;
-				if (cl.paused)
+				if (cl.paused && snd_cdautopause.integer)
 					CDAudio_Pause ();
-				else
+				else if (bgmvolume.value > 0.0f)
 					CDAudio_Resume ();
 				S_PauseGameSounds (cl.paused);
 				break;
@@ -4133,8 +4141,7 @@ void CL_ParseServerMessage(void)
 				// reconnect somehow, so allow signon 1 even if at signon 1
 				if (i <= cls.signon && i != 1)
 					Host_Error ("Received signon %i when at %i", i, cls.signon);
-				cls.signon = i;
-				CL_SignonReply ();
+				CL_SignonReply(i);
 				break;
 
 			case svc_killedmonster:
@@ -4238,11 +4245,8 @@ void CL_ParseServerMessage(void)
 				break;
 			case svc_entities:
 				if (cls.signon == SIGNONS - 1)
-				{
 					// first update is the final signon stage
-					cls.signon = SIGNONS;
-					CL_SignonReply ();
-				}
+					CL_SignonReply(SIGNONS);
 				if (cls.protocol == PROTOCOL_DARKPLACES1 || cls.protocol == PROTOCOL_DARKPLACES2 || cls.protocol == PROTOCOL_DARKPLACES3)
 					EntityFrame_CL_ReadFrame();
 				else if (cls.protocol == PROTOCOL_DARKPLACES4)
@@ -4324,6 +4328,7 @@ void CL_Parse_Init(void)
 	Cvar_RegisterVariable(&cl_sound_ric3);
 	Cvar_RegisterVariable(&cl_sound_ric_gunshot);
 	Cvar_RegisterVariable(&cl_sound_r_exp3);
+	Cvar_RegisterVariable(&snd_cdautopause);
 
 	Cvar_RegisterVariable(&cl_joinbeforedownloadsfinish);