fix bug where only the first portal to see a surface was able to mark triangles as...

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

diff --git a/portals.c b/portals.c
index 4c0bb19a569e9dbbc8deed33b2abc32377d722f4..2f7fa32ee9f9e5739601ca6785f845d59950436a 100644 (file)
--- a/portals.c
+++ b/portals.c
@@ -315,41 +315,38 @@ static void Portal_RecursiveFlow (portalrecursioninfo_t *info, mleaf_t *leaf, in
                for (i = 0;i < leaf->numleafsurfaces;i++)
                {
                        int surfaceindex = leaf->firstleafsurface[i];
-                       if (!CHECKPVSBIT(info->surfacepvs, surfaceindex))
+                       msurface_t *surface = info->model->data_surfaces + surfaceindex;
+                       if (BoxesOverlap(surface->mins, surface->maxs, info->boxmins, info->boxmaxs))
                        {
-                               msurface_t *surface = info->model->data_surfaces + surfaceindex;
-                               if (BoxesOverlap(surface->mins, surface->maxs, info->boxmins, info->boxmaxs))
+                               qboolean insidebox = BoxInsideBox(surface->mins, surface->maxs, info->boxmins, info->boxmaxs);
+                               qboolean addedtris = false;
+                               int t, tend;
+                               const int *elements;
+                               const float *vertex3f;
+                               float v[9];
+                               vertex3f = info->model->surfmesh.data_vertex3f;
+                               elements = (info->model->surfmesh.data_element3i + 3 * surface->num_firsttriangle);
+                               for (t = surface->num_firsttriangle, tend = t + surface->num_triangles;t < tend;t++, elements += 3)
                                {
-                                       qboolean insidebox = BoxInsideBox(surface->mins, surface->maxs, info->boxmins, info->boxmaxs);
-                                       qboolean addedtris = false;
-                                       int t, tend;
-                                       const int *elements;
-                                       const float *vertex3f;
-                                       float v[9];
-                                       vertex3f = info->model->surfmesh.data_vertex3f;
-                                       elements = (info->model->surfmesh.data_element3i + 3 * surface->num_firsttriangle);
-                                       for (t = surface->num_firsttriangle, tend = t + surface->num_triangles;t < tend;t++, elements += 3)
+                                       VectorCopy(vertex3f + elements[0] * 3, v + 0);
+                                       VectorCopy(vertex3f + elements[1] * 3, v + 3);
+                                       VectorCopy(vertex3f + elements[2] * 3, v + 6);
+                                       if (PointInfrontOfTriangle(info->eye, v + 0, v + 3, v + 6)
+                                        && (insidebox || TriangleOverlapsBox(v, v + 3, v + 6, info->boxmins, info->boxmaxs))
+                                        && (!info->exact || Portal_PortalThroughPortalPlanes(&portalplanes[firstclipplane], numclipplanes, v, 3, &portaltemppoints2[0][0], 256) > 0))
                                        {
-                                               VectorCopy(vertex3f + elements[0] * 3, v + 0);
-                                               VectorCopy(vertex3f + elements[1] * 3, v + 3);
-                                               VectorCopy(vertex3f + elements[2] * 3, v + 6);
-                                               if (PointInfrontOfTriangle(info->eye, v + 0, v + 3, v + 6)
-                                                && (insidebox || TriangleOverlapsBox(v, v + 3, v + 6, info->boxmins, info->boxmaxs))
-                                                && (!info->exact || Portal_PortalThroughPortalPlanes(&portalplanes[firstclipplane], numclipplanes, v, 3, &portaltemppoints2[0][0], 256) > 0))
-                                               {
-                                                       addedtris = true;
-                                                       if (info->shadowtrispvs)
-                                                               SETPVSBIT(info->shadowtrispvs, t);
-                                                       if (info->lighttrispvs)
-                                                               SETPVSBIT(info->lighttrispvs, t);
-                                               }
-                                       }
-                                       if (addedtris)
-                                       {
-                                               SETPVSBIT(info->surfacepvs, surfaceindex);
-                                               info->surfacelist[info->numsurfaces++] = surfaceindex;
+                                               addedtris = true;
+                                               if (info->shadowtrispvs)
+                                                       SETPVSBIT(info->shadowtrispvs, t);
+                                               if (info->lighttrispvs)
+                                                       SETPVSBIT(info->lighttrispvs, t);
                                        }
                                }
+                               if (addedtris && !CHECKPVSBIT(info->surfacepvs, surfaceindex))
+                               {
+                                       SETPVSBIT(info->surfacepvs, surfaceindex);
+                                       info->surfacelist[info->numsurfaces++] = surfaceindex;
+                               }
                        }
                }
        }