tweaked the order of checks in an if, and removed the previously mentioned pvs textur...

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

diff --git a/gl_rsurf.c b/gl_rsurf.c
index dbe24cdf16ff00a9517e7f0091c0fa76cb1f93ac..5114da7cfbd30fe721429fe8990223987b47d744 100644 (file)
--- a/gl_rsurf.c
+++ b/gl_rsurf.c
@@ -1425,7 +1425,7 @@ void R_WorldVisibility(void)
                                        surfacevisframes[*mark] = r_framecount;
                        // follow portals into other leafs
                        for (p = leaf->portals;p;p = p->next)
-                               if (DotProduct(r_vieworigin, p->plane.normal) < (p->plane.dist + 1) && p->past->visframe != r_framecount && !R_CullBox(p->mins, p->maxs) && CHECKPVSBIT(r_pvsbits, p->past->clusterindex))
+                               if (DotProduct(r_vieworigin, p->plane.normal) < (p->plane.dist + 1) && p->past->visframe != r_framecount && CHECKPVSBIT(r_pvsbits, p->past->clusterindex) && !R_CullBox(p->mins, p->maxs))
                                        leafstack[leafstackpos++] = p->past;
                }
        }

diff --git a/model_shared.h b/model_shared.h
index 1bfe750ba7653e00eda4a3333c44eda77934cba6..06e9a819f99eccbc3798ec969b62157d0f429ca8 100644 (file)
--- a/model_shared.h
+++ b/model_shared.h
@@ -242,7 +242,6 @@ typedef struct model_brushq1_s
        int                             numsurfaces;
        msurface_t              *surfaces;
        int                             *surfacevisframes;
-       int                             *surfacepvsframes;
        msurface_t              *surfacepvsnext;
 
        int                             numsurfedges;
@@ -274,19 +273,6 @@ typedef struct model_brushq1_s
        int                             numlights;
        mlight_t                *lights;
 
-       // pvs visibility marking
-       mleaf_t                 *pvsviewleaf;
-       int                             pvsviewleafnovis;
-       int                             pvsframecount;
-       mleaf_t                 *pvsleafchain;
-       int                             *pvssurflist;
-       int                             pvssurflistlength;
-       // these get rebuilt as the player moves around if this is the world,
-       // otherwise they are left alone (no pvs for bmodels)
-       msurface_t              ***pvstexturechains;
-       msurface_t              **pvstexturechainsbuffer;
-       int                             *pvstexturechainslength;
-
        // lightmap update chains for light styles
        int                             light_styles;
        qbyte                   *light_style;
@@ -295,7 +281,6 @@ typedef struct model_brushq1_s
        msurface_t              **light_styleupdatechainsbuffer;
 
        mleaf_t *(*PointInLeaf)(struct model_s *model, const float *p);
-       void (*BuildPVSTextureChains)(struct model_s *model);
 }
 model_brushq1_t;