X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=csprogs.c;h=700796a7f6f02e4c7052eee7ac00e2bd312a71ec;hb=86ad97af208bf67f76e57b78246feb773df9f560;hp=07087c9761ac0bf48dfe584f902d90d4e959d12a;hpb=d1c3f1065fde02ed39b7eecc2d9b9a637388d091;p=xonotic%2Fdarkplaces.git

diff --git a/csprogs.c b/csprogs.c
index 07087c97..700796a7 100644
--- a/csprogs.c
+++ b/csprogs.c
@@ -562,12 +562,10 @@ void CL_VM_Parse_StuffCmd (const char *msg)
 		// temporarily so that it can be set by the cvar command,
 		// and then reprotect it afterwards
 		int crcflags = csqc_progcrc.flags;
-		int sizeflags = csqc_progcrc.flags;
 		csqc_progcrc.flags &= ~CVAR_READONLY;
 		csqc_progsize.flags &= ~CVAR_READONLY;
 		Cmd_ExecuteString(&cmd_client, msg, src_command, true);
-		csqc_progcrc.flags = crcflags;
-		csqc_progsize.flags = sizeflags;
+		csqc_progcrc.flags = csqc_progsize.flags = crcflags;
 		return;
 	}
 
@@ -646,13 +644,8 @@ void CSQC_AddPrintText (const char *msg)
 {
 	prvm_prog_t *prog = CLVM_prog;
 	size_t i;
-	if(!cl.csqc_loaded)
-	{
-		Con_Print(msg);
-		return;
-	}
 	CSQC_BEGIN
-	if(PRVM_clientfunction(CSQC_Parse_Print))
+	if(cl.csqc_loaded && PRVM_clientfunction(CSQC_Parse_Print))
 	{
 		// FIXME: is this bugged?
 		i = strlen(msg)-1;
@@ -680,13 +673,8 @@ void CL_VM_Parse_CenterPrint (const char *msg)
 {
 	prvm_prog_t *prog = CLVM_prog;
 	int restorevm_tempstringsbuf_cursize;
-	if(!cl.csqc_loaded)
-	{
-		SCR_CenterPrint(msg);
-		return;
-	}
 	CSQC_BEGIN
-	if(PRVM_clientfunction(CSQC_Parse_CenterPrint))
+	if(cl.csqc_loaded && PRVM_clientfunction(CSQC_Parse_CenterPrint))
 	{
 		PRVM_clientglobalfloat(time) = cl.time;
 		PRVM_clientglobaledict(self) = cl.csqc_server2csqcentitynumber[cl.playerentity];
@@ -1017,7 +1005,7 @@ void CL_VM_Init (void)
 		}
 		else
 		{
-			Con_DPrintf("Not using buffered \"%s\" (buffered: %p, %d)\n", csprogsfn, cls.caughtcsprogsdata, (int) cls.caughtcsprogsdatasize);
+			Con_DPrintf("Not using buffered \"%s\" (buffered: %p, %d)\n", csprogsfn, (void *)cls.caughtcsprogsdata, (int) cls.caughtcsprogsdatasize);
 			csprogsdata = FS_LoadFile(csprogsfn, tempmempool, true, &csprogsdatasize);
 		}
 	}
@@ -1100,8 +1088,6 @@ void CL_VM_Init (void)
 		return;
 	}
 
-	Con_DPrintf("CSQC %s ^5loaded (crc=%i, size=%i)\n", csprogsfn, csprogsdatacrc, (int)csprogsdatasize);
-
 	if(cls.demorecording)
 	{
 		if(cls.demo_lastcsprogssize != csprogsdatasize || cls.demo_lastcsprogscrc != csprogsdatacrc)