X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=csprogs.c;h=05919e59a8bdc4499aef79ff9357545ddf6e075e;hb=aadd101471d0227217f84d3dc6ed03fec4aacd4c;hp=21453faea0f2e5f6cb3b543c02bbfe46eaefba84;hpb=f13419f00e3f8335e9a25498560a433597f28f50;p=xonotic%2Fdarkplaces.git

diff --git a/csprogs.c b/csprogs.c
index 21453fae..05919e59 100644
--- a/csprogs.c
+++ b/csprogs.c
@@ -293,7 +293,7 @@ qbool CSQC_AddRenderEdict(prvm_edict_t *ed, int edictnum)
 	int c;
 	float scale;
 	entity_render_t *entrender;
-	dp_model_t *model;
+	model_t *model;
 	prvm_vec3_t modellight_origin;
 
 	model = CL_GetModelFromEdict(ed);
@@ -564,7 +564,7 @@ void CL_VM_Parse_StuffCmd (const char *msg)
 		int crcflags = csqc_progcrc.flags;
 		csqc_progcrc.flags &= ~CF_READONLY;
 		csqc_progsize.flags &= ~CF_READONLY;
-		Cmd_ExecuteString(&cmd_client, msg, src_local, true);
+		Cmd_ExecuteString(&cmd_local, msg, src_local, true);
 		csqc_progcrc.flags = csqc_progsize.flags = crcflags;
 		return;
 	}
@@ -596,7 +596,7 @@ void CL_VM_Parse_StuffCmd (const char *msg)
 				l = sizeof(buf) - 1;
 			strlcpy(buf, p, l + 1); // strlcpy needs a + 1 as it includes the newline!
 
-			Cmd_ExecuteString(&cmd_client, buf, src_local, true);
+			Cmd_ExecuteString(&cmd_local, buf, src_local, true);
 
 			p += l;
 			if(*p == '\n')
@@ -604,13 +604,13 @@ void CL_VM_Parse_StuffCmd (const char *msg)
 			else
 				break; // end of string or overflow
 		}
-		Cmd_ExecuteString(&cmd_client, "curl --clear_autodownload", src_local, true); // don't inhibit CSQC loading
+		Cmd_ExecuteString(&cmd_local, "curl --clear_autodownload", src_local, true); // don't inhibit CSQC loading
 		return;
 	}
 
 	if(!cl.csqc_loaded)
 	{
-		Cbuf_AddText(&cmd_client, msg);
+		Cbuf_AddText(&cmd_local, msg);
 		return;
 	}
 	CSQC_BEGIN
@@ -624,7 +624,7 @@ void CL_VM_Parse_StuffCmd (const char *msg)
 		prog->tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize;
 	}
 	else
-		Cbuf_AddText(&cmd_client, msg);
+		Cbuf_AddText(&cmd_local, msg);
 	CSQC_END
 }
 
@@ -1049,7 +1049,7 @@ void CL_VM_Init (void)
 		return;
 	}
 
-	PRVM_Prog_Init(prog, &cmd_client);
+	PRVM_Prog_Init(prog, &cmd_local);
 
 	// allocate the mempools
 	prog->progs_mempool = Mem_AllocPool(csqc_progname.string, 0, NULL);
@@ -1149,7 +1149,7 @@ void CL_VM_Init (void)
 void CL_VM_ShutDown (void)
 {
 	prvm_prog_t *prog = CLVM_prog;
-	Cmd_ClearCSQCCommands(&cmd_client);
+	Cmd_ClearCSQCCommands(&cmd_local);
 	//Cvar_SetValueQuick(&csqc_progcrc, -1);
 	//Cvar_SetValueQuick(&csqc_progsize, -1);
 	if(!cl.csqc_loaded)
@@ -1172,7 +1172,7 @@ qbool CL_VM_GetEntitySoundOrigin(int entnum, vec3_t out)
 {
 	prvm_prog_t *prog = CLVM_prog;
 	prvm_edict_t *ed;
-	dp_model_t *mod;
+	model_t *mod;
 	matrix4x4_t matrix;
 	qbool r = 0;