before calling Mod_CanSeeBox_Trace or TraceLineOfSight, check if the model actually...

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

diff --git a/gl_rmain.c b/gl_rmain.c
index c01a68859033abf7ea72a760fcf3d722929bf172..3e4ec0565e8d31d0af237298fb629a20a6549cf2 100644 (file)
--- a/gl_rmain.c
+++ b/gl_rmain.c
@@ -2214,7 +2214,7 @@ static void R_View_UpdateEntityVisible (void)
                        r_viewcache.entityvisible[i] = !(ent->flags & renderimask) && ((ent->model && ent->model->type == mod_sprite && (ent->model->sprite.sprnum_type == SPR_LABEL || ent->model->sprite.sprnum_type == SPR_LABEL_SCALE)) || !R_CullBox(ent->mins, ent->maxs)) && ((ent->effects & EF_NODEPTHTEST) || (ent->flags & RENDER_VIEWMODEL) || r_refdef.worldmodel->brush.BoxTouchingVisibleLeafs(r_refdef.worldmodel, r_viewcache.world_leafvisible, ent->mins, ent->maxs));
 
                }
-               if(r_cullentities_trace.integer)
+               if(r_cullentities_trace.integer && r_refdef.worldmodel->brush.TraceLineOfSight)
                {
                        for (i = 0;i < r_refdef.numentities;i++)
                        {

diff --git a/sv_main.c b/sv_main.c
index 8ce2f6d6923dd75b4957aa739c319a5cd2bc728a..539568693ea00baa323c578e96b5f5b7979aabed 100644 (file)
--- a/sv_main.c
+++ b/sv_main.c
@@ -1263,7 +1263,7 @@ void SV_MarkWriteEntityStateToClient(entity_state_t *s)
                        }
 
                        // or not seen by random tracelines
-                       if (sv_cullentities_trace.integer && !isbmodel)
+                       if (sv_cullentities_trace.integer && !isbmodel && sv.worldmodel->brush.TraceLineOfSight)
                        {
                                int samples = s->specialvisibilityradius ? sv_cullentities_trace_samples_extra.integer : sv_cullentities_trace_samples.integer;
                                float enlarge = sv_cullentities_trace_enlarge.value;