X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=cl_collision.c;h=3275a75168936625aea299ebba69032d027312d4;hp=038c92494aabdf4d8871d746fdacc7819732a467;hb=15368629f4f2f207e22af38b6fa29fdcbbe50982;hpb=00141603df070f44751efaf4afbf9c8cfc7e2e74

diff --git a/cl_collision.c b/cl_collision.c
index 038c9249..3275a751 100644
--- a/cl_collision.c
+++ b/cl_collision.c
@@ -74,7 +74,7 @@ trace_t CL_TraceBox(const vec3_t start, const vec3_t mins, const vec3_t maxs, co
 			trace.realfraction = 1;
 
 			if (ent->model && ent->model->TraceBox)
-				ent->model->TraceBox(ent->model, 0, &trace, start, mins, maxs, endtransformed, hitsupercontentsmask);
+				ent->model->TraceBox(ent->model, 0, &trace, starttransformed, mins, maxs, endtransformed, hitsupercontentsmask);
 
 			// LordHavoc: take the 'best' answers from the new trace and combine with existing data
 			if (trace.allsolid)
@@ -137,7 +137,7 @@ trace_t CL_TraceBox(const vec3_t start, const vec3_t mins, const vec3_t maxs, co
 
 				Matrix4x4_Transform(&ent->inversematrix, start, starttransformed);
 				Matrix4x4_Transform(&ent->inversematrix, end, endtransformed);
-				Collision_ClipTrace_Box(&trace, playermins, playermaxs, starttransformed, mins, maxs, endtransformed, hitsupercontentsmask, SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY);
+				Collision_ClipTrace_Box(&trace, playermins, playermaxs, starttransformed, mins, maxs, endtransformed, hitsupercontentsmask, SUPERCONTENTS_BODY, 0, NULL);
 
 				// LordHavoc: take the 'best' answers from the new trace and combine with existing data
 				if (trace.allsolid)
@@ -197,7 +197,7 @@ 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, start, end, end, SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY);
+		cl.worldmodel->TraceBox(cl.worldmodel, 0, &trace, start, vec3_origin, vec3_origin, end, SUPERCONTENTS_SOLID);
 
 	if (normal)
 		VectorCopy(trace.plane.normal, normal);
@@ -244,8 +244,8 @@ float CL_SelectTraceLine(const vec3_t start, const vec3_t end, vec3_t impact, ve
 		Matrix4x4_Transform(&ent->inversematrix, start, starttransformed);
 		Matrix4x4_Transform(&ent->inversematrix, end, endtransformed);
 
-		if (ent->model && ent->model->TraceBox)
-			ent->model->TraceBox(ent->model, ent->frameblend[0].frame, &trace, starttransformed, starttransformed, endtransformed, endtransformed, SUPERCONTENTS_SOLID | SUPERCONTENTS_BODY);
+		//if (ent->model && ent->model->TraceBox)
+			ent->model->TraceBox(ent->model, ent->frameblend[0].frame, &trace, starttransformed, vec3_origin, vec3_origin, endtransformed, SUPERCONTENTS_SOLID);
 
 		if (maxrealfrac > trace.realfraction)
 		{
@@ -275,25 +275,8 @@ void CL_FindNonSolidLocation(const vec3_t in, vec3_t out, vec_t radius)
 		cl.worldmodel->brush.FindNonSolidLocation(cl.worldmodel, in, out, radius);
 }
 
-int CL_PointQ1Contents(const vec3_t p)
-{
-	return Mod_Q1BSP_NativeContentsFromSuperContents(NULL, CL_TraceBox(p, vec3_origin, vec3_origin, p, true, NULL, 0, false).startsupercontents);
-	/*
-	// FIXME: check multiple brush models
-	if (cl.worldmodel && cl.worldmodel->brush.PointContentsQ1)
-		return cl.worldmodel->brush.PointContentsQ1(cl.worldmodel, p);
-	return 0;
-	*/
-}
-
 int CL_PointSuperContents(const vec3_t p)
 {
 	return CL_TraceBox(p, vec3_origin, vec3_origin, p, true, NULL, 0, false).startsupercontents;
-	/*
-	// FIXME: check multiple brush models
-	if (cl.worldmodel && cl.worldmodel->brush.PointContentsQ1)
-		return cl.worldmodel->brush.PointContentsQ1(cl.worldmodel, p);
-	return 0;
-	*/
 }