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;
clip->trace.ent = touch;
}
clip->trace.startsupercontents |= trace.startsupercontents;
- if (clip->trace.allsolid)
- return;
+ //if (clip->trace.allsolid)
+ // return;
}
}
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));
}
+