fixed really stupid typo in CL_TraceBox regarding bmodel entity collisions (doors...

eliminated CL_PointQ1Contents

git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@6276 d7cf8633-e32d-0410-b094-e92efae38249

diff --git a/cl_collision.c b/cl_collision.c
index 76f41263deddcbb40a1d8d29666e44b8aa160ab0..3275a75168936625aea299ebba69032d027312d4 100644 (file)
--- 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)
                        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)
 
                        // LordHavoc: take the 'best' answers from the new trace and combine with existing data
                        if (trace.allsolid)


@@ -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);
 }
 
                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;
 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;
-       */

 }
 
 }
 

diff --git a/cl_collision.h b/cl_collision.h
index a01940896251276cf81e9c6c61e8187195c33d6b..c4052035380be63a06b7b52312fa91dc95fa4a2f 100644 (file)
--- a/cl_collision.h
+++ b/cl_collision.h
@@ -5,7 +5,6 @@
 trace_t CL_TraceBox(const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int hitbmodels, int *hitent, int hitsupercontentsmask, qboolean hitplayers);
 float CL_SelectTraceLine(const vec3_t start, const vec3_t end, vec3_t impact, vec3_t normal, int *hitent, entity_render_t *ignoreent, qboolean csqcents);
 void CL_FindNonSolidLocation(const vec3_t in, vec3_t out, vec_t radius);
 trace_t CL_TraceBox(const vec3_t start, const vec3_t mins, const vec3_t maxs, const vec3_t end, int hitbmodels, int *hitent, int hitsupercontentsmask, qboolean hitplayers);
 float CL_SelectTraceLine(const vec3_t start, const vec3_t end, vec3_t impact, vec3_t normal, int *hitent, entity_render_t *ignoreent, qboolean csqcents);
 void CL_FindNonSolidLocation(const vec3_t in, vec3_t out, vec_t radius);

-int CL_PointQ1Contents(const vec3_t p);

 int CL_PointSuperContents(const vec3_t p);
 
 #endif
 int CL_PointSuperContents(const vec3_t p);
 
 #endif

diff --git a/clvm_cmds.c b/clvm_cmds.c
index 72833de6aa201a70ade5d673cc8e134bf4f1a420..59c34d5a57c8f0e3ba23ed39d6310f7cdc14b414 100644 (file)
--- a/clvm_cmds.c
+++ b/clvm_cmds.c
@@ -116,7 +116,6 @@ char *vm_cl_extensions =
 ;
 
 sfx_t *S_FindName(const char *name);
 ;
 
 sfx_t *S_FindName(const char *name);

-int CL_PointQ1Contents(const vec3_t p);

 void PF_registercvar (void);
 int Sbar_GetPlayer (int index);
 void Sbar_SortFrags (void);
 void PF_registercvar (void);
 int Sbar_GetPlayer (int index);
 void Sbar_SortFrags (void);


@@ -523,7 +522,7 @@ realcheck:
 void VM_CL_pointcontents (void)
 {
        VM_SAFEPARMCOUNT(1, VM_CL_pointcontents);
 void VM_CL_pointcontents (void)
 {
        VM_SAFEPARMCOUNT(1, VM_CL_pointcontents);

-       PRVM_G_FLOAT(OFS_RETURN) = CL_PointQ1Contents(PRVM_G_VECTOR(OFS_PARM0));
+       PRVM_G_FLOAT(OFS_RETURN) = Mod_Q1BSP_NativeContentsFromSuperContents(NULL, CL_PointSuperContents(PRVM_G_VECTOR(OFS_PARM0)));

 }
 
 // #48 void(vector o, vector d, float color, float count) particle
 }
 
 // #48 void(vector o, vector d, float color, float count) particle

diff --git a/world_cs.c b/world_cs.c
index c71d2e87d72b38e1cf61afa067c36bc4522c37bd..d7bdf936c22a48444016b1dad43d8ca53e75c3a0 100644 (file)
--- a/world_cs.c
+++ b/world_cs.c
@@ -732,9 +732,4 @@ int CSSV_PointSuperContents(const vec3_t point)
        return CSSV_Move(point, vec3_origin, vec3_origin, point, sv_gameplayfix_swiminbmodels.integer ? MOVE_NOMONSTERS : MOVE_WORLDONLY, NULL).startsupercontents;
 }
 
        return CSSV_Move(point, vec3_origin, vec3_origin, point, sv_gameplayfix_swiminbmodels.integer ? MOVE_NOMONSTERS : MOVE_WORLDONLY, NULL).startsupercontents;
 }
 

-int CSSV_PointQ1Contents(const vec3_t point)
-{
-       return Mod_Q1BSP_NativeContentsFromSuperContents(NULL, CSSV_PointSuperContents(point));
-}
-