X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=csprogs.c;h=bd30f4667ad4c214082500ab87f833cb7a7d1997;hp=1c54c5e45e50482aafe1cbea9890d33c2d40fc54;hb=b86597d5083b7c6884a1f01995feaf5e50481df5;hpb=0a05c446ba26bd5897645a37ceec8646c5bc93eb

diff --git a/csprogs.c b/csprogs.c
index 1c54c5e4..bd30f466 100644
--- a/csprogs.c
+++ b/csprogs.c
@@ -1,3 +1,23 @@
+/*
+Copyright (C) 2006-2021 DarkPlaces contributors
+
+This program is free software; you can redistribute it and/or
+modify it under the terms of the GNU General Public License
+as published by the Free Software Foundation; either version 2
+of the License, or (at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+See the GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+
+*/
+
 #include "quakedef.h"
 #include "progsvm.h"
 #include "clprogdefs.h"
@@ -293,7 +313,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);
@@ -487,9 +507,16 @@ qbool CL_VM_UpdateView (double frametime)
 		prog->polygonbegin_guess2d = false;
 		// free memory for resources that are no longer referenced
 		PRVM_GarbageCollection(prog);
-		// pass in width and height as parameters (EXT_CSQC_1)
+		// pass in width and height and menu/focus state as parameters (EXT_CSQC_1)
 		PRVM_G_FLOAT(OFS_PARM0) = vid.width;
 		PRVM_G_FLOAT(OFS_PARM1) = vid.height;
+		/*
+		 * This should be fine for now but FTEQW uses flags for keydest
+		 * and checks that an array called "eyeoffset" is 0
+		 * 
+		 * Just a note in case there's compatibility problems later
+		 */
+		PRVM_G_FLOAT(OFS_PARM2) = key_dest == key_game;
 		prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_UpdateView), "QC function CSQC_UpdateView is missing");
 		//VectorCopy(oldangles, cl.viewangles);
 		// Dresk : Reset Dmg Globals Here
@@ -505,23 +532,7 @@ qbool CL_VM_UpdateView (double frametime)
 qbool CL_VM_ConsoleCommand (const char *text)
 {
 	prvm_prog_t *prog = CLVM_prog;
-	int restorevm_tempstringsbuf_cursize;
-	qbool r = false;
-	if(!cl.csqc_loaded)
-		return false;
-	CSQC_BEGIN
-	if (PRVM_clientfunction(CSQC_ConsoleCommand))
-	{
-		PRVM_clientglobalfloat(time) = cl.time;
-		PRVM_clientglobaledict(self) = cl.csqc_server2csqcentitynumber[cl.playerentity];
-		restorevm_tempstringsbuf_cursize = prog->tempstringsbuf.cursize;
-		PRVM_G_INT(OFS_PARM0) = PRVM_SetTempString(prog, text);
-		prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_ConsoleCommand), "QC function CSQC_ConsoleCommand is missing");
-		prog->tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize;
-		r = CSQC_RETURNVAL != 0;
-	}
-	CSQC_END
-	return r;
+	return PRVM_ConsoleCommand(prog, text, &prog->funcoffsets.CSQC_ConsoleCommand, false, cl.csqc_server2csqcentitynumber[cl.playerentity], cl.time, cl.csqc_loaded, "QC function CSQC_ConsoleCommand is missing");
 }
 
 qbool CL_VM_Parse_TempEntity (void)
@@ -562,9 +573,9 @@ 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;
-		csqc_progcrc.flags &= ~CVAR_READONLY;
-		csqc_progsize.flags &= ~CVAR_READONLY;
-		Cmd_ExecuteString(&cmd_client, msg, src_local, true);
+		csqc_progcrc.flags &= ~CF_READONLY;
+		csqc_progsize.flags &= ~CF_READONLY;
+		Cmd_ExecuteString(cmd_local, msg, src_local, true);
 		csqc_progcrc.flags = csqc_progsize.flags = crcflags;
 		return;
 	}
@@ -596,7 +607,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 +615,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 +635,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 +1060,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 +1160,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 +1183,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;