X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=csprogs.c;h=6d83a7849d7951c27f00bc02804c3a63cb93acc2;hb=8fcbbb10d27dabefbd27a11c6784c783ca035e75;hp=c0c4eb42ff7d63df2f31cad2d17a7a6c5fc9f41d;hpb=2faff26f69150bd8b672cb96556c4028a292cdd5;p=xonotic%2Fdarkplaces.git

diff --git a/csprogs.c b/csprogs.c
index c0c4eb42..6d83a784 100644
--- a/csprogs.c
+++ b/csprogs.c
@@ -266,6 +266,8 @@ void CSQC_Predraw (prvm_edict_t *ed)
 		return;
 	b = PRVM_clientglobaledict(self);
 	PRVM_clientglobaledict(self) = PRVM_EDICT_TO_PROG(ed);
+	// optional entity parameter for self (EXT_ENTITYPARAM)
+	PRVM_G_INT(OFS_PARM0) = PRVM_EDICT_TO_PROG(ed);
 	prog->ExecuteProgram(prog, PRVM_clientedictfunction(ed, predraw), "CSQC_Predraw: NULL function\n");
 	PRVM_clientglobaledict(self) = b;
 }
@@ -280,6 +282,8 @@ void CSQC_Think (prvm_edict_t *ed)
 		PRVM_clientedictfloat(ed, nextthink) = 0;
 		b = PRVM_clientglobaledict(self);
 		PRVM_clientglobaledict(self) = PRVM_EDICT_TO_PROG(ed);
+		// optional entity parameter for self (EXT_ENTITYPARAM)
+		PRVM_G_INT(OFS_PARM0) = PRVM_EDICT_TO_PROG(ed);
 		prog->ExecuteProgram(prog, PRVM_clientedictfunction(ed, think), "CSQC_Think: NULL function\n");
 		PRVM_clientglobaledict(self) = b;
 	}
@@ -452,6 +456,8 @@ qboolean CL_VM_InputEvent (int eventtype, float x, float y)
 			PRVM_G_FLOAT(OFS_PARM0) = eventtype;
 			PRVM_G_FLOAT(OFS_PARM1) = x; // key or x
 			PRVM_G_FLOAT(OFS_PARM2) = y; // ascii or y
+			// optional entity parameter for self (EXT_ENTITYPARAM)
+			PRVM_G_INT(OFS_PARM3) = cl.csqc_server2csqcentitynumber[cl.playerentity];
 			prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_InputEvent), "QC function CSQC_InputEvent is missing");
 			r = CSQC_RETURNVAL != 0;
 		}
@@ -490,6 +496,7 @@ qboolean CL_VM_UpdateView (double frametime)
 		// 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_G_INT(OFS_PARM2) = cl.csqc_server2csqcentitynumber[cl.playerentity];
 		prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_UpdateView), "QC function CSQC_UpdateView is missing");
 		//VectorCopy(oldangles, cl.viewangles);
 		// Dresk : Reset Dmg Globals Here
@@ -518,6 +525,8 @@ qboolean CL_VM_ConsoleCommand (hook_val_t *arg)
 		PRVM_clientglobaledict(self) = cl.csqc_server2csqcentitynumber[cl.playerentity];
 		restorevm_tempstringsbuf_cursize = prog->tempstringsbuf.cursize;
 		PRVM_G_INT(OFS_PARM0) = PRVM_SetTempString(prog, arg->str);
+		// optional entity parameter for self (EXT_ENTITYPARAM)
+		PRVM_G_INT(OFS_PARM1) = cl.csqc_server2csqcentitynumber[cl.playerentity];
 		prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_ConsoleCommand), "QC function CSQC_ConsoleCommand is missing");
 		prog->tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize;
 		r = CSQC_RETURNVAL != 0;
@@ -539,6 +548,8 @@ qboolean CL_VM_Parse_TempEntity (void)
 		t = cl_message.readcount;
 		PRVM_clientglobalfloat(time) = cl.time;
 		PRVM_clientglobaledict(self) = cl.csqc_server2csqcentitynumber[cl.playerentity];
+		// optional entity parameter for self (EXT_ENTITYPARAM)
+		PRVM_G_INT(OFS_PARM0) = cl.csqc_server2csqcentitynumber[cl.playerentity];
 		prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_Parse_TempEntity), "QC function CSQC_Parse_TempEntity is missing");
 		r = CSQC_RETURNVAL != 0;
 		if(!r)
@@ -624,6 +635,8 @@ void CL_VM_Parse_StuffCmd (const char *msg)
 		PRVM_clientglobaledict(self) = cl.csqc_server2csqcentitynumber[cl.playerentity];
 		restorevm_tempstringsbuf_cursize = prog->tempstringsbuf.cursize;
 		PRVM_G_INT(OFS_PARM0) = PRVM_SetTempString(prog, msg);
+		// optional entity parameter for self (EXT_ENTITYPARAM)
+		PRVM_G_INT(OFS_PARM1) = cl.csqc_server2csqcentitynumber[cl.playerentity];
 		prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_Parse_StuffCmd), "QC function CSQC_Parse_StuffCmd is missing");
 		prog->tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize;
 	}
@@ -640,6 +653,8 @@ static void CL_VM_Parse_Print (const char *msg)
 	PRVM_clientglobaledict(self) = cl.csqc_server2csqcentitynumber[cl.playerentity];
 	restorevm_tempstringsbuf_cursize = prog->tempstringsbuf.cursize;
 	PRVM_G_INT(OFS_PARM0) = PRVM_SetTempString(prog, msg);
+	// optional entity parameter for self (EXT_ENTITYPARAM)
+	PRVM_G_INT(OFS_PARM1) = cl.csqc_server2csqcentitynumber[cl.playerentity];
 	prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_Parse_Print), "QC function CSQC_Parse_Print is missing");
 	prog->tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize;
 }
@@ -694,6 +709,8 @@ void CL_VM_Parse_CenterPrint (const char *msg)
 		PRVM_clientglobaledict(self) = cl.csqc_server2csqcentitynumber[cl.playerentity];
 		restorevm_tempstringsbuf_cursize = prog->tempstringsbuf.cursize;
 		PRVM_G_INT(OFS_PARM0) = PRVM_SetTempString(prog, msg);
+		// optional entity parameter for self (EXT_ENTITYPARAM)
+		PRVM_G_INT(OFS_PARM1) = cl.csqc_server2csqcentitynumber[cl.playerentity];
 		prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_Parse_CenterPrint), "QC function CSQC_Parse_CenterPrint is missing");
 		prog->tempstringsbuf.cursize = restorevm_tempstringsbuf_cursize;
 	}
@@ -741,6 +758,7 @@ qboolean CL_VM_Event_Sound(int sound_num, float fvolume, int channel, float atte
 			VectorCopy(pos, PRVM_G_VECTOR(OFS_PARM5) );
 			PRVM_G_FLOAT(OFS_PARM6) = speed * 100.0f;
 			PRVM_G_FLOAT(OFS_PARM7) = flags; // flags
+			// NOTE: entity parameter can't be used here, as there are not enough offsets available
 			prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_Event_Sound), "QC function CSQC_Event_Sound is missing");
 			r = CSQC_RETURNVAL != 0;
 		}
@@ -827,6 +845,8 @@ void CSQC_ReadEntities (void)
 			{
 				if(PRVM_clientglobaledict(self))
 				{
+					// optional entity parameter for self (EXT_ENTITYPARAM)
+					PRVM_G_INT(OFS_PARM0) = cl.csqc_server2csqcentitynumber[realentnum];
 					prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_Ent_Remove), "QC function CSQC_Ent_Remove is missing");
 					cl.csqc_server2csqcentitynumber[realentnum] = 0;
 				}
@@ -861,10 +881,14 @@ void CSQC_ReadEntities (void)
 						PRVM_clientglobaledict(self) = cl.csqc_server2csqcentitynumber[realentnum] = PRVM_EDICT( PRVM_G_INT( OFS_RETURN ) );
 					}
 					PRVM_G_FLOAT(OFS_PARM0) = 1;
+					// optional entity parameter for self (EXT_ENTITYPARAM)
+					PRVM_G_INT(OFS_PARM1) = cl.csqc_server2csqcentitynumber[realentnum];
 					prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_Ent_Update), "QC function CSQC_Ent_Update is missing");
 				}
 				else {
 					PRVM_G_FLOAT(OFS_PARM0) = 0;
+					// optional entity parameter for self (EXT_ENTITYPARAM)
+					PRVM_G_INT(OFS_PARM1) = cl.csqc_server2csqcentitynumber[realentnum];
 					prog->ExecuteProgram(prog, PRVM_clientfunction(CSQC_Ent_Update), "QC function CSQC_Ent_Update is missing");
 				}
 			}
@@ -1235,6 +1259,8 @@ qboolean CL_VM_TransformView(int entnum, matrix4x4_t *viewmatrix, mplane_t *clip
 				PRVM_clientglobaledict(self) = entnum;
 				VectorCopy(origin, PRVM_G_VECTOR(OFS_PARM0));
 				VectorCopy(ang, PRVM_G_VECTOR(OFS_PARM1));
+				// optional entity parameter for self (EXT_ENTITYPARAM)
+				PRVM_G_INT(OFS_PARM2) = entnum;
 				VectorCopy(forward, PRVM_clientglobalvector(v_forward));
 				VectorScale(left, -1, PRVM_clientglobalvector(v_right));
 				VectorCopy(up, PRVM_clientglobalvector(v_up));