X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=csprogs.c;h=14165f0f8802cccc569e345e2b956f3ee6309fc0;hp=299e914f39f77301b9ef1d836471e689e4f5d280;hb=a29fbf7e2ef22d2db034211bcad8fda91555a7b1;hpb=fb55f65f8f10dfaf093b99b8055d204888af0e85

diff --git a/csprogs.c b/csprogs.c
index 299e914f..14165f0f 100644
--- a/csprogs.c
+++ b/csprogs.c
@@ -44,7 +44,7 @@ void CL_VM_Error (const char *format, ...)	//[515]: hope it will be never execut
 	Cvar_SetValueQuick(&csqc_progsize, -1);
 
 //	Host_AbortCurrentFrame();	//[515]: hmmm... if server says it needs csqc then client MUST disconnect
-	Host_Error(va("CL_VM_Error: %s", errorstring));
+	Host_Error("CL_VM_Error: %s", errorstring);
 }
 void CL_VM_UpdateDmgGlobals (int dmg_take, int dmg_save, vec3_t dmg_origin)
 {
@@ -212,6 +212,7 @@ qboolean CSQC_AddRenderEdict(prvm_edict_t *ed)
 	else
 		CL_SetEntityColormapColors(entrender, c);
 
+	entrender->flags &= ~(RENDER_SHADOW | RENDER_LIGHT | RENDER_NOSELFSHADOW);
 	// either fullbright or lit
 	if (!(entrender->effects & EF_FULLBRIGHT) && !r_fullbright.integer)
 		entrender->flags |= RENDER_LIGHT;
@@ -272,6 +273,9 @@ qboolean CL_VM_UpdateView (void)
 		// CSQC_UpdateView function does not call R_ClearScene as it should
 		r_refdef.scene.numentities = 0;
 		r_refdef.scene.numlights = 0;
+		// pass in width and height as parameters (EXT_CSQC_1)
+		PRVM_G_FLOAT(OFS_PARM0) = vid.width;
+		PRVM_G_FLOAT(OFS_PARM1) = vid.height;
 		PRVM_ExecuteProgram(prog->funcoffsets.CSQC_UpdateView, "QC function CSQC_UpdateView is missing");
 		//VectorCopy(oldangles, cl.viewangles);
 		// Dresk : Reset Dmg Globals Here
@@ -346,6 +350,46 @@ void CL_VM_Parse_StuffCmd (const char *msg)
 		csqc_progsize.flags = sizeflags;
 		return;
 	}
+
+	if(cls.demoplayback)
+	if(!strncmp(msg, "curl --clear_autodownload\ncurl --pak --forthismap --as ", 55))
+	{
+		// special handling for map download commands
+		// run these commands IMMEDIATELY, instead of waiting for a client frame
+		// that way, there is no black screen when playing back demos
+		// I know this is a really ugly hack, but I can't think of any better way
+		// FIXME find the actual CAUSE of this, and make demo playback WAIT
+		// until all maps are loaded, then remove this hack
+
+		char buf[MAX_INPUTLINE];
+		const char *p, *q;
+		size_t l;
+
+		p = msg;
+
+		for(;;)
+		{
+			q = strchr(p, '\n');
+			if(q)
+				l = q - p;
+			else
+				l = strlen(p);
+			if(l > sizeof(buf) - 1)
+				l = sizeof(buf) - 1;
+			strlcpy(buf, p, l + 1); // strlcpy needs a + 1 as it includes the newline!
+
+			Cmd_ExecuteString(buf, src_command);
+
+			p += l;
+			if(*p == '\n')
+				++p; // skip the newline and continue
+			else
+				break; // end of string or overflow
+		}
+		Cmd_ExecuteString("curl --clear_autodownload", src_command); // don't inhibit CSQC loading
+		return;
+	}
+
 	if(!cl.csqc_loaded)
 	{
 		Cbuf_AddText(msg);
@@ -822,7 +866,7 @@ void CL_VM_Init (void)
 			i = 0;
 
 			CL_CutDemo(&demobuf, &demofilesize);
-			while(MakeDownloadPacket(csprogsfn, csprogsdata, csprogsdatasize, csprogsdatacrc, i++, &sb, cls.protocol))
+			while(MakeDownloadPacket(csqc_progname.string, csprogsdata, csprogsdatasize, csprogsdatacrc, i++, &sb, cls.protocol))
 				CL_WriteDemoMessage(&sb);
 			CL_PasteDemo(&demobuf, &demofilesize);