X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cl_collision.c;h=0f8ab408ae2af3f1bac59fe661469fc8a878b5a0;hp=e4f0c36fdcb5d7269aa6f4d0f5d03dffb464b8a1;hb=e660b4c0147da9f4b5db110a05cfbadcea6b1b64;hpb=9b45c4242e6f64c354ab7d55366a2cecbfd86a10

diff --git a/cl_collision.c b/cl_collision.c
index e4f0c36f..0f8ab408 100644
--- a/cl_collision.c
+++ b/cl_collision.c
@@ -2,7 +2,11 @@
 #include "quakedef.h"
 #include "cl_collision.h"
 
+#ifdef COLLISION_STUPID_TRACE_ENDPOS_IN_SOLID_WORKAROUND
+float CL_SelectTraceLine(const vec3_t start, const vec3_t pEnd, vec3_t impact, vec3_t normal, int *hitent, entity_render_t *ignoreent)
+#else
 float CL_SelectTraceLine(const vec3_t start, const vec3_t end, vec3_t impact, vec3_t normal, int *hitent, entity_render_t *ignoreent)
+#endif
 {
 	float maxfrac, maxrealfrac;
 	int n;
@@ -10,6 +14,20 @@ float CL_SelectTraceLine(const vec3_t start, const vec3_t end, vec3_t impact, ve
 	float tracemins[3], tracemaxs[3];
 	trace_t trace;
 	float tempnormal[3], starttransformed[3], endtransformed[3];
+#ifdef COLLISION_STUPID_TRACE_ENDPOS_IN_SOLID_WORKAROUND
+	vec3_t end;
+	vec_t len = 0;
+
+	if(!VectorCompare(start, pEnd) && collision_endposnudge.value > 0)
+	{
+		// TRICK: make the trace 1 qu longer!
+		VectorSubtract(pEnd, start, end);
+		len = VectorNormalizeLength(end);
+		VectorMA(pEnd, collision_endposnudge.value, end, end);
+	}
+	else
+		VectorCopy(pEnd, end);
+#endif
 
 	memset (&trace, 0 , sizeof(trace_t));
 	trace.fraction = 1;
@@ -18,8 +36,8 @@ float CL_SelectTraceLine(const vec3_t start, const vec3_t end, vec3_t impact, ve
 
 	if (hitent)
 		*hitent = 0;
-	if (cl.worldmodel && cl.worldmodel->TraceBox)
-		cl.worldmodel->TraceBox(cl.worldmodel, 0, &trace, start, vec3_origin, vec3_origin, end, SUPERCONTENTS_SOLID);
+	if (cl.worldmodel && cl.worldmodel->TraceLine)
+		cl.worldmodel->TraceLine(cl.worldmodel, NULL, NULL, &trace, start, end, SUPERCONTENTS_SOLID);
 
 	if (normal)
 		VectorCopy(trace.plane.normal, normal);
@@ -41,7 +59,7 @@ float CL_SelectTraceLine(const vec3_t start, const vec3_t end, vec3_t impact, ve
 		ent = &cl.entities[n].render;
 		if (!BoxesOverlap(ent->mins, ent->maxs, tracemins, tracemaxs))
 			continue;
-		if (!ent->model || !ent->model->TraceBox)
+		if (!ent->model || !ent->model->TraceLine)
 			continue;
 		if ((ent->flags & RENDER_EXTERIORMODEL) && !chase_active.integer)
 			continue;
@@ -52,9 +70,15 @@ float CL_SelectTraceLine(const vec3_t start, const vec3_t end, vec3_t impact, ve
 			continue;
 		Matrix4x4_Transform(&ent->inversematrix, start, starttransformed);
 		Matrix4x4_Transform(&ent->inversematrix, end, endtransformed);
+		Collision_ClipTrace_Box(&trace, ent->model->normalmins, ent->model->normalmaxs, starttransformed, vec3_origin, vec3_origin, endtransformed, SUPERCONTENTS_SOLID, SUPERCONTENTS_SOLID, 0, NULL);
+#ifdef COLLISION_STUPID_TRACE_ENDPOS_IN_SOLID_WORKAROUND
+		if(!VectorCompare(start, pEnd) && collision_endposnudge.value > 0)
+			Collision_ShortenTrace(&trace, len / (len + collision_endposnudge.value), pEnd);
+#endif
+		if (maxrealfrac < trace.realfraction)
+			continue;
 
-		//if (ent->model && ent->model->TraceBox)
-			ent->model->TraceBox(ent->model, ent->frameblend[0].frame, &trace, starttransformed, vec3_origin, vec3_origin, endtransformed, SUPERCONTENTS_SOLID);
+		ent->model->TraceLine(ent->model, ent->frameblend, ent->skeleton, &trace, starttransformed, endtransformed, SUPERCONTENTS_SOLID);
 
 		if (maxrealfrac > trace.realfraction)
 		{
@@ -84,7 +108,7 @@ void CL_FindNonSolidLocation(const vec3_t in, vec3_t out, vec_t radius)
 		cl.worldmodel->brush.FindNonSolidLocation(cl.worldmodel, in, out, radius);
 }
 
-model_t *CL_GetModelByIndex(int modelindex)
+dp_model_t *CL_GetModelByIndex(int modelindex)
 {
 	if(!modelindex)
 		return NULL;
@@ -102,7 +126,7 @@ model_t *CL_GetModelByIndex(int modelindex)
 	return NULL;
 }
 
-model_t *CL_GetModelFromEdict(prvm_edict_t *ed)
+dp_model_t *CL_GetModelFromEdict(prvm_edict_t *ed)
 {
 	if (!ed || ed->priv.server->free)
 		return NULL;
@@ -111,26 +135,73 @@ model_t *CL_GetModelFromEdict(prvm_edict_t *ed)
 
 void CL_LinkEdict(prvm_edict_t *ent)
 {
+	vec3_t mins, maxs;
+
 	if (ent == prog->edicts)
 		return;		// don't add the world
 
 	if (ent->priv.server->free)
 		return;
 
-	VectorAdd(ent->fields.client->origin, ent->fields.client->mins, ent->fields.client->absmin);
-	VectorAdd(ent->fields.client->origin, ent->fields.client->maxs, ent->fields.client->absmax);
+	// set the abs box
+
+	if (ent->fields.client->solid == SOLID_BSP)
+	{
+		dp_model_t *model = CL_GetModelByIndex( (int)ent->fields.client->modelindex );
+		if (model == NULL)
+		{
+			Con_Printf("edict %i: SOLID_BSP with invalid modelindex!\n", PRVM_NUM_FOR_EDICT(ent));
+
+			model = CL_GetModelByIndex( 0 );
+		}
+
+		if( model != NULL )
+		{
+			if (!model->TraceBox)
+				Con_DPrintf("edict %i: SOLID_BSP with non-collidable model\n", PRVM_NUM_FOR_EDICT(ent));
+
+			if (ent->fields.client->angles[0] || ent->fields.client->angles[2] || ent->fields.client->avelocity[0] || ent->fields.client->avelocity[2])
+			{
+				VectorAdd(ent->fields.client->origin, model->rotatedmins, mins);
+				VectorAdd(ent->fields.client->origin, model->rotatedmaxs, maxs);
+			}
+			else if (ent->fields.client->angles[1] || ent->fields.client->avelocity[1])
+			{
+				VectorAdd(ent->fields.client->origin, model->yawmins, mins);
+				VectorAdd(ent->fields.client->origin, model->yawmaxs, maxs);
+			}
+			else
+			{
+				VectorAdd(ent->fields.client->origin, model->normalmins, mins);
+				VectorAdd(ent->fields.client->origin, model->normalmaxs, maxs);
+			}
+		}
+		else
+		{
+			// SOLID_BSP with no model is valid, mainly because some QC setup code does so temporarily
+			VectorAdd(ent->fields.client->origin, ent->fields.client->mins, mins);
+			VectorAdd(ent->fields.client->origin, ent->fields.client->maxs, maxs);
+		}
+	}
+	else
+	{
+		VectorAdd(ent->fields.client->origin, ent->fields.client->mins, mins);
+		VectorAdd(ent->fields.client->origin, ent->fields.client->maxs, maxs);
+	}
+
+	VectorCopy(mins, ent->fields.client->absmin);
+	VectorCopy(maxs, ent->fields.client->absmax);
 
 	World_LinkEdict(&cl.world, ent, ent->fields.client->absmin, ent->fields.client->absmax);
 }
 
 int CL_GenericHitSuperContentsMask(const prvm_edict_t *passedict)
 {
-	prvm_eval_t *val;
 	if (passedict)
 	{
-		val = PRVM_EDICTFIELDVALUE(passedict, prog->fieldoffsets.dphitcontentsmask);
-		if (val && val->_float)
-			return (int)val->_float;
+		int dphitcontentsmask = (int)PRVM_clientedictfloat(passedict, dphitcontentsmask);
+		if (dphitcontentsmask)
+			return dphitcontentsmask;
 		else if (passedict->fields.client->solid == SOLID_SLIDEBOX)
 		{
 			if ((int)passedict->fields.client->flags & FL_MONSTER)
@@ -154,7 +225,456 @@ int CL_GenericHitSuperContentsMask(const prvm_edict_t *passedict)
 CL_Move
 ==================
 */
-trace_t CL_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int type, prvm_edict_t *passedict, int hitsupercontentsmask, qboolean hitnetworkbrushmodels, qboolean hitnetworkplayers, int *hitnetworkentity, qboolean hitcsqcentities)
+trace_t CL_TracePoint(const vec3_t start, int type, prvm_edict_t *passedict, int hitsupercontentsmask, qboolean hitnetworkbrushmodels, qboolean hitnetworkplayers, int *hitnetworkentity, qboolean hitcsqcentities)
+{
+	int i, bodysupercontents;
+	int passedictprog;
+	prvm_edict_t *traceowner, *touch;
+	trace_t trace;
+	// bounding box of entire move area
+	vec3_t clipboxmins, clipboxmaxs;
+	// size when clipping against monsters
+	vec3_t clipmins2, clipmaxs2;
+	// start and end origin of move
+	vec3_t clipstart;
+	// trace results
+	trace_t cliptrace;
+	// matrices to transform into/out of other entity's space
+	matrix4x4_t matrix, imatrix;
+	// model of other entity
+	dp_model_t *model;
+	// list of entities to test for collisions
+	int numtouchedicts;
+	static prvm_edict_t *touchedicts[MAX_EDICTS];
+
+	if (hitnetworkentity)
+		*hitnetworkentity = 0;
+
+	VectorCopy(start, clipstart);
+	VectorClear(clipmins2);
+	VectorClear(clipmaxs2);
+#if COLLISIONPARANOID >= 3
+	Con_Printf("move(%f %f %f)", clipstart[0], clipstart[1], clipstart[2]);
+#endif
+
+	// clip to world
+	Collision_ClipPointToWorld(&cliptrace, cl.worldmodel, clipstart, hitsupercontentsmask);
+	cliptrace.bmodelstartsolid = cliptrace.startsolid;
+	if (cliptrace.startsolid || cliptrace.fraction < 1)
+		cliptrace.ent = prog ? prog->edicts : NULL;
+	if (type == MOVE_WORLDONLY)
+		goto finished;
+
+	if (type == MOVE_MISSILE)
+	{
+		// LordHavoc: modified this, was = -15, now -= 15
+		for (i = 0;i < 3;i++)
+		{
+			clipmins2[i] -= 15;
+			clipmaxs2[i] += 15;
+		}
+	}
+
+	// create the bounding box of the entire move
+	for (i = 0;i < 3;i++)
+	{
+		clipboxmins[i] = clipstart[i] - 1;
+		clipboxmaxs[i] = clipstart[i] + 1;
+	}
+
+	// debug override to test against everything
+	if (sv_debugmove.integer)
+	{
+		clipboxmins[0] = clipboxmins[1] = clipboxmins[2] = -999999999;
+		clipboxmaxs[0] = clipboxmaxs[1] = clipboxmaxs[2] =  999999999;
+	}
+
+	// if the passedict is world, make it NULL (to avoid two checks each time)
+	// this checks prog because this function is often called without a CSQC
+	// VM context
+	if (prog == NULL || passedict == prog->edicts)
+		passedict = NULL;
+	// precalculate prog value for passedict for comparisons
+	passedictprog = prog != NULL ? PRVM_EDICT_TO_PROG(passedict) : 0;
+	// precalculate passedict's owner edict pointer for comparisons
+	traceowner = passedict ? PRVM_PROG_TO_EDICT(passedict->fields.client->owner) : NULL;
+
+	// collide against network entities
+	if (hitnetworkbrushmodels)
+	{
+		for (i = 0;i < cl.num_brushmodel_entities;i++)
+		{
+			entity_render_t *ent = &cl.entities[cl.brushmodel_entities[i]].render;
+			if (!BoxesOverlap(clipboxmins, clipboxmaxs, ent->mins, ent->maxs))
+				continue;
+			Collision_ClipPointToGenericEntity(&trace, ent->model, ent->frameblend, ent->skeleton, vec3_origin, vec3_origin, 0, &ent->matrix, &ent->inversematrix, start, hitsupercontentsmask);
+			if (cliptrace.realfraction > trace.realfraction && hitnetworkentity)
+				*hitnetworkentity = cl.brushmodel_entities[i];
+			Collision_CombineTraces(&cliptrace, &trace, NULL, true);
+		}
+	}
+
+	// collide against player entities
+	if (hitnetworkplayers)
+	{
+		vec3_t origin, entmins, entmaxs;
+		matrix4x4_t entmatrix, entinversematrix;
+
+		if(gamemode == GAME_NEXUIZ || gamemode == GAME_XONOTIC)
+		{
+			// don't hit network players, if we are a nonsolid player
+			if(cl.scores[cl.playerentity-1].frags == -666 || cl.scores[cl.playerentity-1].frags == -616)
+				goto skipnetworkplayers;
+		}
+
+		for (i = 1;i <= cl.maxclients;i++)
+		{
+			entity_render_t *ent = &cl.entities[i].render;
+
+			// don't hit ourselves
+			if (i == cl.playerentity)
+				continue;
+
+			// don't hit players that don't exist
+			if (!cl.scores[i-1].name[0])
+				continue;
+
+			if(gamemode == GAME_NEXUIZ || gamemode == GAME_XONOTIC)
+			{
+				// don't hit spectators or nonsolid players
+				if(cl.scores[i-1].frags == -666 || cl.scores[i-1].frags == -616)
+					continue;
+			}
+
+			Matrix4x4_OriginFromMatrix(&ent->matrix, origin);
+			VectorAdd(origin, cl.playerstandmins, entmins);
+			VectorAdd(origin, cl.playerstandmaxs, entmaxs);
+			if (!BoxesOverlap(clipboxmins, clipboxmaxs, entmins, entmaxs))
+				continue;
+			Matrix4x4_CreateTranslate(&entmatrix, origin[0], origin[1], origin[2]);
+			Matrix4x4_CreateTranslate(&entinversematrix, -origin[0], -origin[1], -origin[2]);
+			Collision_ClipPointToGenericEntity(&trace, NULL, NULL, NULL, cl.playerstandmins, cl.playerstandmaxs, SUPERCONTENTS_BODY, &entmatrix, &entinversematrix, start, hitsupercontentsmask);
+			if (cliptrace.realfraction > trace.realfraction && hitnetworkentity)
+				*hitnetworkentity = i;
+			Collision_CombineTraces(&cliptrace, &trace, NULL, false);
+		}
+
+skipnetworkplayers:
+		;
+	}
+
+	// clip to entities
+	// because this uses World_EntitiestoBox, we know all entity boxes overlap
+	// the clip region, so we can skip culling checks in the loop below
+	// note: if prog is NULL then there won't be any linked entities
+	numtouchedicts = 0;
+	if (hitcsqcentities && prog != NULL)
+	{
+		numtouchedicts = World_EntitiesInBox(&cl.world, clipboxmins, clipboxmaxs, MAX_EDICTS, touchedicts);
+		if (numtouchedicts > MAX_EDICTS)
+		{
+			// this never happens
+			Con_Printf("CL_EntitiesInBox returned %i edicts, max was %i\n", numtouchedicts, MAX_EDICTS);
+			numtouchedicts = MAX_EDICTS;
+		}
+	}
+	for (i = 0;i < numtouchedicts;i++)
+	{
+		touch = touchedicts[i];
+
+		if (touch->fields.client->solid < SOLID_BBOX)
+			continue;
+		if (type == MOVE_NOMONSTERS && touch->fields.client->solid != SOLID_BSP)
+			continue;
+
+		if (passedict)
+		{
+			// don't clip against self
+			if (passedict == touch)
+				continue;
+			// don't clip owned entities against owner
+			if (traceowner == touch)
+				continue;
+			// don't clip owner against owned entities
+			if (passedictprog == touch->fields.client->owner)
+				continue;
+			// don't clip points against points (they can't collide)
+			if (VectorCompare(touch->fields.client->mins, touch->fields.client->maxs) && (type != MOVE_MISSILE || !((int)touch->fields.client->flags & FL_MONSTER)))
+				continue;
+		}
+
+		bodysupercontents = touch->fields.client->solid == SOLID_CORPSE ? SUPERCONTENTS_CORPSE : SUPERCONTENTS_BODY;
+
+		// might interact, so do an exact clip
+		model = NULL;
+		if ((int) touch->fields.client->solid == SOLID_BSP || type == MOVE_HITMODEL)
+			model = CL_GetModelFromEdict(touch);
+		if (model)
+			Matrix4x4_CreateFromQuakeEntity(&matrix, touch->fields.client->origin[0], touch->fields.client->origin[1], touch->fields.client->origin[2], touch->fields.client->angles[0], touch->fields.client->angles[1], touch->fields.client->angles[2], 1);
+		else
+			Matrix4x4_CreateTranslate(&matrix, touch->fields.client->origin[0], touch->fields.client->origin[1], touch->fields.client->origin[2]);
+		Matrix4x4_Invert_Simple(&imatrix, &matrix);
+		if ((int)touch->fields.client->flags & FL_MONSTER)
+			Collision_ClipToGenericEntity(&trace, model, touch->priv.server->frameblend, &touch->priv.server->skeleton, touch->fields.client->mins, touch->fields.client->maxs, bodysupercontents, &matrix, &imatrix, clipstart, clipmins2, clipmaxs2, clipstart, hitsupercontentsmask);
+		else
+			Collision_ClipPointToGenericEntity(&trace, model, touch->priv.server->frameblend, &touch->priv.server->skeleton, touch->fields.client->mins, touch->fields.client->maxs, bodysupercontents, &matrix, &imatrix, clipstart, hitsupercontentsmask);
+
+		if (cliptrace.realfraction > trace.realfraction && hitnetworkentity)
+			*hitnetworkentity = 0;
+		Collision_CombineTraces(&cliptrace, &trace, (void *)touch, touch->fields.client->solid == SOLID_BSP);
+	}
+
+finished:
+	return cliptrace;
+}
+
+/*
+==================
+CL_TraceLine
+==================
+*/
+#ifdef COLLISION_STUPID_TRACE_ENDPOS_IN_SOLID_WORKAROUND
+trace_t CL_TraceLine(const vec3_t start, const vec3_t pEnd, int type, prvm_edict_t *passedict, int hitsupercontentsmask, qboolean hitnetworkbrushmodels, qboolean hitnetworkplayers, int *hitnetworkentity, qboolean hitcsqcentities, qboolean hitsurfaces)
+#else
+trace_t CL_TraceLine(const vec3_t start, const vec3_t end, int type, prvm_edict_t *passedict, int hitsupercontentsmask, qboolean hitnetworkbrushmodels, qboolean hitnetworkplayers, int *hitnetworkentity, qboolean hitcsqcentities, qboolean hitsurfaces)
+#endif
+{
+	int i, bodysupercontents;
+	int passedictprog;
+	prvm_edict_t *traceowner, *touch;
+	trace_t trace;
+	// bounding box of entire move area
+	vec3_t clipboxmins, clipboxmaxs;
+	// size when clipping against monsters
+	vec3_t clipmins2, clipmaxs2;
+	// start and end origin of move
+	vec3_t clipstart, clipend;
+	// trace results
+	trace_t cliptrace;
+	// matrices to transform into/out of other entity's space
+	matrix4x4_t matrix, imatrix;
+	// model of other entity
+	dp_model_t *model;
+	// list of entities to test for collisions
+	int numtouchedicts;
+	static prvm_edict_t *touchedicts[MAX_EDICTS];
+#ifdef COLLISION_STUPID_TRACE_ENDPOS_IN_SOLID_WORKAROUND
+	vec3_t end;
+	vec_t len = 0;
+
+	if (VectorCompare(start, pEnd))
+		return CL_TracePoint(start, type, passedict, hitsupercontentsmask, hitnetworkbrushmodels, hitnetworkplayers, hitnetworkentity, hitcsqcentities);
+
+	if(collision_endposnudge.value > 0)
+	{
+		// TRICK: make the trace 1 qu longer!
+		VectorSubtract(pEnd, start, end);
+		len = VectorNormalizeLength(end);
+		VectorMA(pEnd, collision_endposnudge.value, end, end);
+	}
+	else
+		VectorCopy(pEnd, end);
+#else
+	if (VectorCompare(start, end))
+		return CL_TracePoint(start, type, passedict, hitsupercontentsmask, hitnetworkbrushmodels, hitnetworkplayers, hitnetworkentity, hitcsqcentities);
+#endif
+
+	if (hitnetworkentity)
+		*hitnetworkentity = 0;
+
+	VectorCopy(start, clipstart);
+	VectorCopy(end, clipend);
+	VectorClear(clipmins2);
+	VectorClear(clipmaxs2);
+#if COLLISIONPARANOID >= 3
+	Con_Printf("move(%f %f %f,%f %f %f)", clipstart[0], clipstart[1], clipstart[2], clipend[0], clipend[1], clipend[2]);
+#endif
+
+	// clip to world
+	Collision_ClipLineToWorld(&cliptrace, cl.worldmodel, clipstart, clipend, hitsupercontentsmask, hitsurfaces);
+	cliptrace.bmodelstartsolid = cliptrace.startsolid;
+	if (cliptrace.startsolid || cliptrace.fraction < 1)
+		cliptrace.ent = prog ? prog->edicts : NULL;
+	if (type == MOVE_WORLDONLY)
+		goto finished;
+
+	if (type == MOVE_MISSILE)
+	{
+		// LordHavoc: modified this, was = -15, now -= 15
+		for (i = 0;i < 3;i++)
+		{
+			clipmins2[i] -= 15;
+			clipmaxs2[i] += 15;
+		}
+	}
+
+	// create the bounding box of the entire move
+	for (i = 0;i < 3;i++)
+	{
+		clipboxmins[i] = min(clipstart[i], cliptrace.endpos[i]) + clipmins2[i] - 1;
+		clipboxmaxs[i] = max(clipstart[i], cliptrace.endpos[i]) + clipmaxs2[i] + 1;
+	}
+
+	// debug override to test against everything
+	if (sv_debugmove.integer)
+	{
+		clipboxmins[0] = clipboxmins[1] = clipboxmins[2] = -999999999;
+		clipboxmaxs[0] = clipboxmaxs[1] = clipboxmaxs[2] =  999999999;
+	}
+
+	// if the passedict is world, make it NULL (to avoid two checks each time)
+	// this checks prog because this function is often called without a CSQC
+	// VM context
+	if (prog == NULL || passedict == prog->edicts)
+		passedict = NULL;
+	// precalculate prog value for passedict for comparisons
+	passedictprog = prog != NULL ? PRVM_EDICT_TO_PROG(passedict) : 0;
+	// precalculate passedict's owner edict pointer for comparisons
+	traceowner = passedict ? PRVM_PROG_TO_EDICT(passedict->fields.client->owner) : NULL;
+
+	// collide against network entities
+	if (hitnetworkbrushmodels)
+	{
+		for (i = 0;i < cl.num_brushmodel_entities;i++)
+		{
+			entity_render_t *ent = &cl.entities[cl.brushmodel_entities[i]].render;
+			if (!BoxesOverlap(clipboxmins, clipboxmaxs, ent->mins, ent->maxs))
+				continue;
+			Collision_ClipLineToGenericEntity(&trace, ent->model, ent->frameblend, ent->skeleton, vec3_origin, vec3_origin, 0, &ent->matrix, &ent->inversematrix, start, end, hitsupercontentsmask, hitsurfaces);
+			if (cliptrace.realfraction > trace.realfraction && hitnetworkentity)
+				*hitnetworkentity = cl.brushmodel_entities[i];
+			Collision_CombineTraces(&cliptrace, &trace, NULL, true);
+		}
+	}
+
+	// collide against player entities
+	if (hitnetworkplayers)
+	{
+		vec3_t origin, entmins, entmaxs;
+		matrix4x4_t entmatrix, entinversematrix;
+
+		if(gamemode == GAME_NEXUIZ || gamemode == GAME_XONOTIC)
+		{
+			// don't hit network players, if we are a nonsolid player
+			if(cl.scores[cl.playerentity-1].frags == -666 || cl.scores[cl.playerentity-1].frags == -616)
+				goto skipnetworkplayers;
+		}
+
+		for (i = 1;i <= cl.maxclients;i++)
+		{
+			entity_render_t *ent = &cl.entities[i].render;
+
+			// don't hit ourselves
+			if (i == cl.playerentity)
+				continue;
+
+			// don't hit players that don't exist
+			if (!cl.scores[i-1].name[0])
+				continue;
+
+			if(gamemode == GAME_NEXUIZ || gamemode == GAME_XONOTIC)
+			{
+				// don't hit spectators or nonsolid players
+				if(cl.scores[i-1].frags == -666 || cl.scores[i-1].frags == -616)
+					continue;
+			}
+
+			Matrix4x4_OriginFromMatrix(&ent->matrix, origin);
+			VectorAdd(origin, cl.playerstandmins, entmins);
+			VectorAdd(origin, cl.playerstandmaxs, entmaxs);
+			if (!BoxesOverlap(clipboxmins, clipboxmaxs, entmins, entmaxs))
+				continue;
+			Matrix4x4_CreateTranslate(&entmatrix, origin[0], origin[1], origin[2]);
+			Matrix4x4_CreateTranslate(&entinversematrix, -origin[0], -origin[1], -origin[2]);
+			Collision_ClipLineToGenericEntity(&trace, NULL, NULL, NULL, cl.playerstandmins, cl.playerstandmaxs, SUPERCONTENTS_BODY, &entmatrix, &entinversematrix, start, end, hitsupercontentsmask, hitsurfaces);
+			if (cliptrace.realfraction > trace.realfraction && hitnetworkentity)
+				*hitnetworkentity = i;
+			Collision_CombineTraces(&cliptrace, &trace, NULL, false);
+		}
+
+skipnetworkplayers:
+		;
+	}
+
+	// clip to entities
+	// because this uses World_EntitiestoBox, we know all entity boxes overlap
+	// the clip region, so we can skip culling checks in the loop below
+	// note: if prog is NULL then there won't be any linked entities
+	numtouchedicts = 0;
+	if (hitcsqcentities && prog != NULL)
+	{
+		numtouchedicts = World_EntitiesInBox(&cl.world, clipboxmins, clipboxmaxs, MAX_EDICTS, touchedicts);
+		if (numtouchedicts > MAX_EDICTS)
+		{
+			// this never happens
+			Con_Printf("CL_EntitiesInBox returned %i edicts, max was %i\n", numtouchedicts, MAX_EDICTS);
+			numtouchedicts = MAX_EDICTS;
+		}
+	}
+	for (i = 0;i < numtouchedicts;i++)
+	{
+		touch = touchedicts[i];
+
+		if (touch->fields.client->solid < SOLID_BBOX)
+			continue;
+		if (type == MOVE_NOMONSTERS && touch->fields.client->solid != SOLID_BSP)
+			continue;
+
+		if (passedict)
+		{
+			// don't clip against self
+			if (passedict == touch)
+				continue;
+			// don't clip owned entities against owner
+			if (traceowner == touch)
+				continue;
+			// don't clip owner against owned entities
+			if (passedictprog == touch->fields.client->owner)
+				continue;
+			// don't clip points against points (they can't collide)
+			if (VectorCompare(touch->fields.client->mins, touch->fields.client->maxs) && (type != MOVE_MISSILE || !((int)touch->fields.client->flags & FL_MONSTER)))
+				continue;
+		}
+
+		bodysupercontents = touch->fields.client->solid == SOLID_CORPSE ? SUPERCONTENTS_CORPSE : SUPERCONTENTS_BODY;
+
+		// might interact, so do an exact clip
+		model = NULL;
+		if ((int) touch->fields.client->solid == SOLID_BSP || type == MOVE_HITMODEL)
+			model = CL_GetModelFromEdict(touch);
+		if (model)
+			Matrix4x4_CreateFromQuakeEntity(&matrix, touch->fields.client->origin[0], touch->fields.client->origin[1], touch->fields.client->origin[2], touch->fields.client->angles[0], touch->fields.client->angles[1], touch->fields.client->angles[2], 1);
+		else
+			Matrix4x4_CreateTranslate(&matrix, touch->fields.client->origin[0], touch->fields.client->origin[1], touch->fields.client->origin[2]);
+		Matrix4x4_Invert_Simple(&imatrix, &matrix);
+		if (type == MOVE_MISSILE && (int)touch->fields.client->flags & FL_MONSTER)
+			Collision_ClipToGenericEntity(&trace, model, touch->priv.server->frameblend, &touch->priv.server->skeleton, touch->fields.client->mins, touch->fields.client->maxs, bodysupercontents, &matrix, &imatrix, clipstart, clipmins2, clipmaxs2, clipend, hitsupercontentsmask);
+		else
+			Collision_ClipLineToGenericEntity(&trace, model, touch->priv.server->frameblend, &touch->priv.server->skeleton, touch->fields.client->mins, touch->fields.client->maxs, bodysupercontents, &matrix, &imatrix, clipstart, clipend, hitsupercontentsmask, hitsurfaces);
+
+		if (cliptrace.realfraction > trace.realfraction && hitnetworkentity)
+			*hitnetworkentity = 0;
+		Collision_CombineTraces(&cliptrace, &trace, (void *)touch, touch->fields.client->solid == SOLID_BSP);
+	}
+
+finished:
+#ifdef COLLISION_STUPID_TRACE_ENDPOS_IN_SOLID_WORKAROUND
+	if(!VectorCompare(start, pEnd) && collision_endposnudge.value > 0)
+		Collision_ShortenTrace(&cliptrace, len / (len + collision_endposnudge.value), pEnd);
+#endif
+	return cliptrace;
+}
+
+/*
+==================
+CL_Move
+==================
+*/
+#ifdef COLLISION_STUPID_TRACE_ENDPOS_IN_SOLID_WORKAROUND
+trace_t CL_TraceBox(const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t pEnd, int type, prvm_edict_t *passedict, int hitsupercontentsmask, qboolean hitnetworkbrushmodels, qboolean hitnetworkplayers, int *hitnetworkentity, qboolean hitcsqcentities)
+#else
+trace_t CL_TraceBox(const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int type, prvm_edict_t *passedict, int hitsupercontentsmask, qboolean hitnetworkbrushmodels, qboolean hitnetworkplayers, int *hitnetworkentity, qboolean hitcsqcentities)
+#endif
 {
 	vec3_t hullmins, hullmaxs;
 	int i, bodysupercontents;
@@ -175,10 +695,50 @@ trace_t CL_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const
 	// matrices to transform into/out of other entity's space
 	matrix4x4_t matrix, imatrix;
 	// model of other entity
-	model_t *model;
+	dp_model_t *model;
 	// list of entities to test for collisions
 	int numtouchedicts;
-	prvm_edict_t *touchedicts[MAX_EDICTS];
+	static prvm_edict_t *touchedicts[MAX_EDICTS];
+#ifdef COLLISION_STUPID_TRACE_ENDPOS_IN_SOLID_WORKAROUND
+	vec3_t end;
+	vec_t len = 0;
+
+	if (VectorCompare(mins, maxs))
+	{
+		vec3_t shiftstart, shiftend;
+		VectorAdd(start, mins, shiftstart);
+		VectorAdd(pEnd, mins, shiftend);
+		if (VectorCompare(start, pEnd))
+			trace = CL_TracePoint(shiftstart, type, passedict, hitsupercontentsmask, hitnetworkbrushmodels, hitnetworkplayers, hitnetworkentity, hitcsqcentities);
+		else
+			trace = CL_TraceLine(shiftstart, shiftend, type, passedict, hitsupercontentsmask, hitnetworkbrushmodels, hitnetworkplayers, hitnetworkentity, hitcsqcentities, false);
+		VectorSubtract(trace.endpos, mins, trace.endpos);
+		return trace;
+	}
+
+	if(!VectorCompare(start, pEnd) && collision_endposnudge.value > 0)
+	{
+		// TRICK: make the trace 1 qu longer!
+		VectorSubtract(pEnd, start, end);
+		len = VectorNormalizeLength(end);
+		VectorMA(pEnd, collision_endposnudge.value, end, end);
+	}
+	else
+		VectorCopy(pEnd, end);
+#else
+	if (VectorCompare(mins, maxs))
+	{
+		vec3_t shiftstart, shiftend;
+		VectorAdd(start, mins, shiftstart);
+		VectorAdd(end, mins, shiftend);
+		if (VectorCompare(start, end))
+			trace = CL_TracePoint(shiftstart, type, passedict, hitsupercontentsmask, hitnetworkbrushmodels, hitnetworkplayers, hitnetworkentity, hitcsqcentities);
+		else
+			trace = CL_TraceLine(shiftstart, shiftend, type, passedict, hitsupercontentsmask, hitnetworkbrushmodels, hitnetworkplayers, hitnetworkentity, hitcsqcentities, false);
+		VectorSubtract(trace.endpos, mins, trace.endpos);
+		return trace;
+	}
+#endif
 
 	if (hitnetworkentity)
 		*hitnetworkentity = 0;
@@ -199,7 +759,7 @@ trace_t CL_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const
 	if (cliptrace.startsolid || cliptrace.fraction < 1)
 		cliptrace.ent = prog ? prog->edicts : NULL;
 	if (type == MOVE_WORLDONLY)
-		return cliptrace;
+		goto finished;
 
 	if (type == MOVE_MISSILE)
 	{
@@ -244,7 +804,7 @@ trace_t CL_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const
 	// figure out whether this is a point trace for comparisons
 	pointtrace = VectorCompare(clipmins, clipmaxs);
 	// precalculate passedict's owner edict pointer for comparisons
-	traceowner = passedict ? PRVM_PROG_TO_EDICT(passedict->fields.client->owner) : 0;
+	traceowner = passedict ? PRVM_PROG_TO_EDICT(passedict->fields.client->owner) : NULL;
 
 	// collide against network entities
 	if (hitnetworkbrushmodels)
@@ -254,7 +814,7 @@ trace_t CL_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const
 			entity_render_t *ent = &cl.entities[cl.brushmodel_entities[i]].render;
 			if (!BoxesOverlap(clipboxmins, clipboxmaxs, ent->mins, ent->maxs))
 				continue;
-			Collision_ClipToGenericEntity(&trace, ent->model, ent->frame2, vec3_origin, vec3_origin, 0, &ent->matrix, &ent->inversematrix, start, mins, maxs, end, hitsupercontentsmask);
+			Collision_ClipToGenericEntity(&trace, ent->model, ent->frameblend, ent->skeleton, vec3_origin, vec3_origin, 0, &ent->matrix, &ent->inversematrix, start, mins, maxs, end, hitsupercontentsmask);
 			if (cliptrace.realfraction > trace.realfraction && hitnetworkentity)
 				*hitnetworkentity = cl.brushmodel_entities[i];
 			Collision_CombineTraces(&cliptrace, &trace, NULL, true);
@@ -266,12 +826,33 @@ trace_t CL_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const
 	{
 		vec3_t origin, entmins, entmaxs;
 		matrix4x4_t entmatrix, entinversematrix;
-		for (i = 1;i < cl.maxclients+1;i++)
+
+		if(gamemode == GAME_NEXUIZ || gamemode == GAME_XONOTIC)
+		{
+			// don't hit network players, if we are a nonsolid player
+			if(cl.scores[cl.playerentity-1].frags == -666 || cl.scores[cl.playerentity-1].frags == -616)
+				goto skipnetworkplayers;
+		}
+
+		for (i = 1;i <= cl.maxclients;i++)
 		{
 			entity_render_t *ent = &cl.entities[i].render;
+
 			// don't hit ourselves
 			if (i == cl.playerentity)
 				continue;
+
+			// don't hit players that don't exist
+			if (!cl.scores[i-1].name[0])
+				continue;
+
+			if(gamemode == GAME_NEXUIZ || gamemode == GAME_XONOTIC)
+			{
+				// don't hit spectators or nonsolid players
+				if(cl.scores[i-1].frags == -666 || cl.scores[i-1].frags == -616)
+					continue;
+			}
+
 			Matrix4x4_OriginFromMatrix(&ent->matrix, origin);
 			VectorAdd(origin, cl.playerstandmins, entmins);
 			VectorAdd(origin, cl.playerstandmaxs, entmaxs);
@@ -279,11 +860,14 @@ trace_t CL_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const
 				continue;
 			Matrix4x4_CreateTranslate(&entmatrix, origin[0], origin[1], origin[2]);
 			Matrix4x4_CreateTranslate(&entinversematrix, -origin[0], -origin[1], -origin[2]);
-			Collision_ClipToGenericEntity(&trace, NULL, 0, cl.playerstandmins, cl.playerstandmaxs, SUPERCONTENTS_BODY, &entmatrix, &entinversematrix, start, mins, maxs, end, hitsupercontentsmask);
+			Collision_ClipToGenericEntity(&trace, NULL, NULL, NULL, cl.playerstandmins, cl.playerstandmaxs, SUPERCONTENTS_BODY, &entmatrix, &entinversematrix, start, mins, maxs, end, hitsupercontentsmask);
 			if (cliptrace.realfraction > trace.realfraction && hitnetworkentity)
 				*hitnetworkentity = i;
 			Collision_CombineTraces(&cliptrace, &trace, NULL, false);
 		}
+
+skipnetworkplayers:
+		;
 	}
 
 	// clip to entities
@@ -331,26 +915,26 @@ trace_t CL_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const
 		// might interact, so do an exact clip
 		model = NULL;
 		if ((int) touch->fields.client->solid == SOLID_BSP || type == MOVE_HITMODEL)
-		{
-			unsigned int modelindex = (unsigned int)touch->fields.client->modelindex;
-			// if the modelindex is 0, it shouldn't be SOLID_BSP!
-			if (modelindex > 0 && modelindex < MAX_MODELS)
-				model = cl.model_precache[(int)touch->fields.client->modelindex];
-		}
+			model = CL_GetModelFromEdict(touch);
 		if (model)
 			Matrix4x4_CreateFromQuakeEntity(&matrix, touch->fields.client->origin[0], touch->fields.client->origin[1], touch->fields.client->origin[2], touch->fields.client->angles[0], touch->fields.client->angles[1], touch->fields.client->angles[2], 1);
 		else
 			Matrix4x4_CreateTranslate(&matrix, touch->fields.client->origin[0], touch->fields.client->origin[1], touch->fields.client->origin[2]);
 		Matrix4x4_Invert_Simple(&imatrix, &matrix);
 		if ((int)touch->fields.client->flags & FL_MONSTER)
-			Collision_ClipToGenericEntity(&trace, model, touch->fields.client->frame, touch->fields.client->mins, touch->fields.client->maxs, bodysupercontents, &matrix, &imatrix, clipstart, clipmins2, clipmaxs2, clipend, hitsupercontentsmask);
+			Collision_ClipToGenericEntity(&trace, model, touch->priv.server->frameblend, &touch->priv.server->skeleton, touch->fields.client->mins, touch->fields.client->maxs, bodysupercontents, &matrix, &imatrix, clipstart, clipmins2, clipmaxs2, clipend, hitsupercontentsmask);
 		else
-			Collision_ClipToGenericEntity(&trace, model, touch->fields.client->frame, touch->fields.client->mins, touch->fields.client->maxs, bodysupercontents, &matrix, &imatrix, clipstart, clipmins, clipmaxs, clipend, hitsupercontentsmask);
+			Collision_ClipToGenericEntity(&trace, model, touch->priv.server->frameblend, &touch->priv.server->skeleton, touch->fields.client->mins, touch->fields.client->maxs, bodysupercontents, &matrix, &imatrix, clipstart, clipmins, clipmaxs, clipend, hitsupercontentsmask);
 
 		if (cliptrace.realfraction > trace.realfraction && hitnetworkentity)
 			*hitnetworkentity = 0;
 		Collision_CombineTraces(&cliptrace, &trace, (void *)touch, touch->fields.client->solid == SOLID_BSP);
 	}
 
+finished:
+#ifdef COLLISION_STUPID_TRACE_ENDPOS_IN_SOLID_WORKAROUND
+	if(!VectorCompare(start, pEnd) && collision_endposnudge.value > 0)
+		Collision_ShortenTrace(&cliptrace, len / (len + collision_endposnudge.value), pEnd);
+#endif
 	return cliptrace;
 }