Added the cvar sbar_alpha.

[xonotic/darkplaces.git] / world.c

diff --git a/world.c b/world.c
index 78c3af3bade27d294441fe99ae243f52a12eebf6..b25bd98f984509cfa5c8bf60ad4416ab56e10771 100644 (file)
--- a/world.c
+++ b/world.c
@@ -484,6 +484,9 @@ trace_t SV_ClipMoveToEntity(edict_t *ent, const vec3_t start, const vec3_t mins,
        Matrix4x4_Invert_Simple(&imatrix, &matrix);
        Matrix4x4_Transform(&imatrix, start, starttransformed);
        Matrix4x4_Transform(&imatrix, end, endtransformed);
+#ifdef COLLISIONPARANOID
+       Con_Printf("trans(%f %f %f -> %f %f %f, %f %f %f -> %f %f %f)", start[0], start[1], start[2], starttransformed[0], starttransformed[1], starttransformed[2], end[0], end[1], end[2], endtransformed[0], endtransformed[1], endtransformed[2]);
+#endif
 
        if (model && model->TraceBox)
        {
@@ -581,8 +584,8 @@ void SV_ClipToNode(moveclip_t *clip, link_t *list)
                if (trace.startsolid)
                {
                        clip->trace.startsolid = true;
-                       if (!clip->trace.ent)
-                               clip->trace.ent = trace.ent;
+                       //if (!clip->trace.ent)
+                       //      clip->trace.ent = trace.ent;
                }
                if (trace.inopen)
                        clip->trace.inopen = true;
@@ -596,8 +599,8 @@ void SV_ClipToNode(moveclip_t *clip, link_t *list)
                        clip->trace.ent = touch;
                }
                clip->trace.startsupercontents |= trace.startsupercontents;
-               if (clip->trace.allsolid)
-                       return;
+               //if (clip->trace.allsolid)
+               //      return;
        }
 }
 
@@ -623,6 +626,9 @@ trace_t SV_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const
        VectorCopy(maxs, clip.maxs2);
        clip.type = type;
        clip.passedict = passedict;
+#ifdef COLLISIONPARANOID
+       Con_Printf("move(%f %f %f,%f %f %f)", clip.start[0], clip.start[1], clip.start[2], clip.end[0], clip.end[1], clip.end[2]);
+#endif
 
        // clip to world
        clip.trace = SV_ClipMoveToEntity(sv.edicts, clip.start, clip.mins, clip.maxs, clip.end, clip.type);
@@ -690,25 +696,14 @@ trace_t SV_Move(const vec3_t start, const vec3_t mins, const vec3_t maxs, const
        return clip.trace;
 }
 
-int SV_PointQ1Contents(const vec3_t point)
+int SV_PointSuperContents(const vec3_t point)
 {
-#if 1
-       return Mod_Q1BSP_NativeContentsFromSuperContents(NULL, SV_Move(point, vec3_origin, vec3_origin, point, MOVE_NOMONSTERS, NULL).startsupercontents);
-#else
-       if (sv.worldmodel && sv.worldmodel->brush.PointContents)
-               return sv.worldmodel->brush.PointContents(sv.worldmodel, point);
-       return CONTENTS_SOLID;
-#endif
+       return SV_Move(point, vec3_origin, vec3_origin, point, MOVE_NOMONSTERS, NULL).startsupercontents;
 }
 
-int SV_PointSuperContents(const vec3_t point)
+int SV_PointQ1Contents(const vec3_t point)
 {
-#if 1
-       return SV_Move(point, vec3_origin, vec3_origin, point, MOVE_NOMONSTERS, NULL).startsupercontents;
-#else
-       if (sv.worldmodel && sv.worldmodel->brush.PointContents)
-               return sv.worldmodel->brush.PointContents(sv.worldmodel, point);
-       return CONTENTS_SOLID;
-#endif
+       return Mod_Q1BSP_NativeContentsFromSuperContents(NULL, SV_PointSuperContents(point));
 }
 
+