X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=clvm_cmds.c;h=7849ffe2a29b846d032a1704bc334a798904f8dd;hb=efc6629305754ddf8d825cfbde14aeef169f318b;hp=82ce9fbd62f011e882aca961e8d3b1f694548041;hpb=824e9a3f2178deeca89aa347c122676f184d26be;p=xonotic%2Fdarkplaces.git

diff --git a/clvm_cmds.c b/clvm_cmds.c
index 82ce9fbd..7849ffe2 100644
--- a/clvm_cmds.c
+++ b/clvm_cmds.c
@@ -238,6 +238,9 @@ void CL_VM_SetTraceGlobals(const trace_t *trace, int svent)
 		val->_float = svent;
 }
 
+#define CL_HitNetworkBrushModels(move) !((move) == MOVE_WORLDONLY)
+#define CL_HitNetworkPlayers(move)     !((move) == MOVE_WORLDONLY || (move) == MOVE_NOMONSTERS)
+
 // #16 float(vector v1, vector v2, float movetype, entity ignore) traceline
 static void VM_CL_traceline (void)
 {
@@ -258,7 +261,7 @@ static void VM_CL_traceline (void)
 	if (IS_NAN(v1[0]) || IS_NAN(v1[1]) || IS_NAN(v1[2]) || IS_NAN(v2[0]) || IS_NAN(v1[2]) || IS_NAN(v2[2]))
 		PRVM_ERROR("%s: NAN errors detected in traceline('%f %f %f', '%f %f %f', %i, entity %i)\n", PRVM_NAME, v1[0], v1[1], v1[2], v2[0], v2[1], v2[2], move, PRVM_EDICT_TO_PROG(ent));
 
-	trace = CL_Move(v1, vec3_origin, vec3_origin, v2, move, ent, CL_GenericHitSuperContentsMask(ent), true, true, &svent, true);
+	trace = CL_Move(v1, vec3_origin, vec3_origin, v2, move, ent, CL_GenericHitSuperContentsMask(ent), CL_HitNetworkBrushModels(move), CL_HitNetworkPlayers(move), &svent, true);
 
 	CL_VM_SetTraceGlobals(&trace, svent);
 }
@@ -296,7 +299,7 @@ static void VM_CL_tracebox (void)
 	if (IS_NAN(v1[0]) || IS_NAN(v1[1]) || IS_NAN(v1[2]) || IS_NAN(v2[0]) || IS_NAN(v1[2]) || IS_NAN(v2[2]))
 		PRVM_ERROR("%s: NAN errors detected in tracebox('%f %f %f', '%f %f %f', '%f %f %f', '%f %f %f', %i, entity %i)\n", PRVM_NAME, v1[0], v1[1], v1[2], m1[0], m1[1], m1[2], m2[0], m2[1], m2[2], v2[0], v2[1], v2[2], move, PRVM_EDICT_TO_PROG(ent));
 
-	trace = CL_Move(v1, m1, m2, v2, move, ent, CL_GenericHitSuperContentsMask(ent), true, true, &svent, true);
+	trace = CL_Move(v1, m1, m2, v2, move, ent, CL_GenericHitSuperContentsMask(ent), CL_HitNetworkBrushModels(move), CL_HitNetworkPlayers(move), &svent, true);
 
 	CL_VM_SetTraceGlobals(&trace, svent);
 }
@@ -914,7 +917,8 @@ void VM_CL_R_AddDynamicLight (void)
 	VectorScale(prog->globals.client->v_up, radius, up);
 	Matrix4x4_FromVectors(&matrix, forward, left, up, org);
 
-	R_RTLight_Update(&r_refdef.scene.lights[r_refdef.scene.numlights++], false, &matrix, col, style, cubemapname, castshadow, coronaintensity, coronasizescale, ambientscale, diffusescale, specularscale, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+	R_RTLight_Update(&r_refdef.scene.templights[r_refdef.scene.numlights], false, &matrix, col, style, cubemapname, castshadow, coronaintensity, coronasizescale, ambientscale, diffusescale, specularscale, LIGHTFLAG_NORMALMODE | LIGHTFLAG_REALTIMEMODE);
+	r_refdef.scene.lights[r_refdef.scene.numlights] = &r_refdef.scene.templights[r_refdef.scene.numlights++];
 }
 
 //============================================================================
@@ -1362,7 +1366,7 @@ static void VM_CL_ReadPicture (void)
 		{
 			// texture not found
 			// use the attached jpeg as texture
-			buf = Mem_Alloc(tempmempool, size);
+			buf = (unsigned char *) Mem_Alloc(tempmempool, size);
 			MSG_ReadBytes(size, buf);
 			data = JPEG_LoadImage_BGRA(buf, size);
 			Mem_Free(buf);
@@ -2161,6 +2165,35 @@ void VM_CL_setattachment (void)
 /////////////////////////////////////////
 // DP_MD3_TAGINFO extension coded by VorteX
 
+int CL_GetExtendedTagInfo (prvm_edict_t *e, int tagindex, int *parentindex, const char **tagname, matrix4x4_t *tag_localmatrix)
+{
+	int r;
+	dp_model_t *model;
+	int frame;
+
+	*tagname = NULL;
+	*parentindex = 0;
+	Matrix4x4_CreateIdentity(tag_localmatrix);
+
+	if (tagindex >= 0
+	 && (model = CL_GetModelFromEdict(e))
+	 && model->animscenes)
+	{
+		frame = (int)e->fields.client->frame;
+		if (frame < 0 || frame >= model->numframes)
+			frame = 0;
+
+		r = Mod_Alias_GetExtendedTagInfoForIndex(model, (int)e->fields.client->skin, model->animscenes[frame].firstframe, tagindex - 1, parentindex, tagname, tag_localmatrix);
+
+		if(!r) // success?
+			*parentindex += 1;
+
+		return r;
+	}
+
+	return 1;
+}
+
 int CL_GetTagIndex (prvm_edict_t *e, const char *tagname)
 {
 	dp_model_t *model = CL_GetModelFromEdict(e);
@@ -2258,6 +2291,7 @@ int CL_GetTagMatrix (matrix4x4_t *out, prvm_edict_t *ent, int tagindex)
 	if (val && val->_float != 0)
 		scale = val->_float;
 	// Alias models have inverse pitch, bmodels can't have tags, so don't check for modeltype...
+	// FIXME: support RF_USEAXIS
 	Matrix4x4_CreateFromQuakeEntity(&entitymatrix, ent->fields.client->origin[0], ent->fields.client->origin[1], ent->fields.client->origin[2], -ent->fields.client->angles[0], ent->fields.client->angles[1], ent->fields.client->angles[2], scale);
 	Matrix4x4_Concat(out, &entitymatrix, &tagmatrix);
 
@@ -2340,7 +2374,12 @@ void VM_CL_gettaginfo (void)
 	prvm_edict_t *e;
 	int tagindex;
 	matrix4x4_t tag_matrix;
+	matrix4x4_t tag_localmatrix;
+	int parentindex;
+	const char *tagname;
 	int returncode;
+	prvm_eval_t *val;
+	vec3_t fo, ri, up, trans;
 
 	VM_SAFEPARMCOUNT(2, VM_CL_gettaginfo);
 
@@ -2348,6 +2387,21 @@ void VM_CL_gettaginfo (void)
 	tagindex = (int)PRVM_G_FLOAT(OFS_PARM1);
 	returncode = CL_GetTagMatrix(&tag_matrix, e, tagindex);
 	Matrix4x4_ToVectors(&tag_matrix, prog->globals.client->v_forward, prog->globals.client->v_right, prog->globals.client->v_up, PRVM_G_VECTOR(OFS_RETURN));
+	CL_GetExtendedTagInfo(e, tagindex, &parentindex, &tagname, &tag_localmatrix);
+	Matrix4x4_ToVectors(&tag_localmatrix, fo, ri, up, trans);
+
+	if((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.gettaginfo_parent)))
+		val->_float = parentindex;
+	if((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.gettaginfo_name)))
+		val->string = tagname ? PRVM_SetTempString(tagname) : 0;
+	if((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.gettaginfo_offset)))
+		VectorCopy(trans, val->vector);
+	if((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.gettaginfo_forward)))
+		VectorCopy(fo, val->vector);
+	if((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.gettaginfo_right)))
+		VectorCopy(ri, val->vector);
+	if((val = PRVM_GLOBALFIELDVALUE(prog->globaloffsets.gettaginfo_up)))
+		VectorCopy(up, val->vector);
 
 	switch(returncode)
 	{
@@ -2798,7 +2852,7 @@ realcheck:
 	start[0] = stop[0] = (mins[0] + maxs[0])*0.5;
 	start[1] = stop[1] = (mins[1] + maxs[1])*0.5;
 	stop[2] = start[2] - 2*sv_stepheight.value;
-	trace = CL_Move (start, vec3_origin, vec3_origin, stop, MOVE_NOMONSTERS, ent, CL_GenericHitSuperContentsMask(ent), true, true, NULL, true);
+	trace = CL_Move (start, vec3_origin, vec3_origin, stop, MOVE_NOMONSTERS, ent, CL_GenericHitSuperContentsMask(ent), true, false, NULL, true);
 
 	if (trace.fraction == 1.0)
 		return false;
@@ -2811,7 +2865,7 @@ realcheck:
 			start[0] = stop[0] = x ? maxs[0] : mins[0];
 			start[1] = stop[1] = y ? maxs[1] : mins[1];
 
-			trace = CL_Move (start, vec3_origin, vec3_origin, stop, MOVE_NOMONSTERS, ent, CL_GenericHitSuperContentsMask(ent), true, true, NULL, true);
+			trace = CL_Move (start, vec3_origin, vec3_origin, stop, MOVE_NOMONSTERS, ent, CL_GenericHitSuperContentsMask(ent), true, false, NULL, true);
 
 			if (trace.fraction != 1.0 && trace.endpos[2] > bottom)
 				bottom = trace.endpos[2];
@@ -3552,6 +3606,17 @@ VM_cvar_description,					// #518 float(string name) cvar_description = #518; (DP
 NULL,							// #519
 VM_keynumtostring,				// #520 string keynumtostring(float keynum)
 VM_findkeysforcommand,		// #521 string findkeysforcommand(string command)
+NULL,							// #522
+NULL,							// #523
+NULL,							// #524
+NULL,							// #525
+NULL,							// #526
+NULL,							// #527
+NULL,							// #528
+NULL,							// #529
+NULL,							// #530
+NULL,					// #531
+NULL,							// #532
 };
 
 const int vm_cl_numbuiltins = sizeof(vm_cl_builtins) / sizeof(prvm_builtin_t);