X-Git-Url: https://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cl_demo.c;h=beab8f84ed84354dc28d5f813e3a77ae4b13895b;hp=502a7fac4581fe0aa5ed7d9b51ecd3d1b5810651;hb=HEAD;hpb=74f27a6bceaf968eb7558edc0d297f03722da5c7

diff --git a/cl_demo.c b/cl_demo.c
index 502a7fac..f44e539f 100644
--- a/cl_demo.c
+++ b/cl_demo.c
@@ -244,6 +244,13 @@ void CL_ReadDemoMessage(void)
 			}
 		}
 
+		/* At signon 1 the cl_begindownloads command starts the world and, if applicable,
+		 * boots up CSQC which may be required to parse the next message.
+		 * That will be delayed if curl must first (down)load the map.
+		 */
+		if (cls.signon == 1 && cl.loadcsqc) // waiting for CL_VM_Init() to be called
+			return;
+
 		// get the next message
 		FS_Read(cls.demofile, &cl_message.cursize, 4);
 		cl_message.cursize = LittleLong(cl_message.cursize);
@@ -341,6 +348,7 @@ void CL_Record_f(cmd_state_t *cmd)
 	int c, track;
 	char name[MAX_OSPATH];
 	char vabuf[1024];
+	int vabuf_len;
 
 	c = Cmd_Argc(cmd);
 	if (c != 2 && c != 3 && c != 4)
@@ -374,12 +382,15 @@ void CL_Record_f(cmd_state_t *cmd)
 		track = -1;
 
 	// get the demo name
-	strlcpy (name, Cmd_Argv(cmd, 1), sizeof (name));
+	dp_strlcpy (name, Cmd_Argv(cmd, 1), sizeof (name));
 	FS_DefaultExtension (name, ".dem", sizeof (name));
 
 	// start the map up
 	if (c > 2)
-		Cmd_ExecuteString ( cmd, va(vabuf, sizeof(vabuf), "map %s", Cmd_Argv(cmd, 2)), src_local, false);
+	{
+		vabuf_len = dpsnprintf(vabuf, sizeof(vabuf), "map %s", Cmd_Argv(cmd, 2));
+		Cmd_ExecuteString(cmd, vabuf, vabuf_len, src_local, false);
+	}
 
 	// open the demo file
 	Con_Printf("recording to %s.\n", name);
@@ -389,7 +400,7 @@ void CL_Record_f(cmd_state_t *cmd)
 		Con_Print(CON_ERROR "ERROR: couldn't open.\n");
 		return;
 	}
-	strlcpy(cls.demoname, name, sizeof(cls.demoname));
+	dp_strlcpy(cls.demoname, name, sizeof(cls.demoname));
 
 	cls.forcetrack = track;
 	FS_Printf(cls.demofile, "%i\n", cls.forcetrack);
@@ -407,7 +418,7 @@ void CL_PlayDemo(const char *demo)
 	qfile_t *f;
 
 	// open the demo file
-	strlcpy (name, demo, sizeof (name));
+	dp_strlcpy (name, demo, sizeof (name));
 	FS_DefaultExtension (name, ".dem", sizeof (name));
 	f = FS_OpenVirtualFile(name, false);
 	if (!f)
@@ -429,7 +440,7 @@ void CL_PlayDemo(const char *demo)
 
 	Con_Printf("Playing demo %s.\n", name);
 	cls.demofile = f;
-	strlcpy(cls.demoname, name, sizeof(cls.demoname));
+	dp_strlcpy(cls.demoname, name, sizeof(cls.demoname));
 
 	cls.demoplayback = true;
 	cls.state = ca_connected;
@@ -655,7 +666,7 @@ static void CL_Startdemos_f(cmd_state_t *cmd)
 	Con_DPrintf("%i demo(s) in loop\n", c);
 
 	for (i=1 ; i<c+1 ; i++)
-		strlcpy (cls.demos[i-1], Cmd_Argv(cmd, i), sizeof (cls.demos[i-1]));
+		dp_strlcpy (cls.demos[i-1], Cmd_Argv(cmd, i), sizeof (cls.demos[i-1]));
 
 	// LadyHavoc: clear the remaining slots
 	for (;i <= MAX_DEMOS;i++)
@@ -663,6 +674,16 @@ static void CL_Startdemos_f(cmd_state_t *cmd)
 
 	if (!sv.active && cls.demonum != -1 && !cls.demoplayback)
 	{
+		if (!cl_startdemos.integer)
+		{
+			cls.demonum = -1;
+#ifdef CONFIG_MENU
+			// make the menu appear after a gamedir change
+			if(MR_ToggleMenu)
+				MR_ToggleMenu(1);
+#endif
+			return;
+		}
 		cls.demonum = 0;
 		CL_NextDemo ();
 	}
@@ -726,4 +747,5 @@ void CL_Demo_Init(void)
 	Cvar_RegisterVariable (&cl_autodemo);
 	Cvar_RegisterVariable (&cl_autodemo_nameformat);
 	Cvar_RegisterVariable (&cl_autodemo_delete);
+	Cvar_RegisterVariable (&cl_startdemos);
 }