updated Dev-C++ project file from Spirit

[xonotic/darkplaces.git] / portals.c

diff --git a/portals.c b/portals.c
index 6df894264d40c563e552060ef3f3da7692b78ea4..759fa4d7f2ceefd757b9beb4d2273903c15bb5f1 100644 (file)
--- a/portals.c
+++ b/portals.c
@@ -24,7 +24,7 @@ static int Portal_PortalThroughPortalPlanes(tinyplane_t *clipplanes, int clipnum
        memcpy(&portaltemppoints[0][0][0], targpoints, numpoints * 3 * sizeof(float));
        for (i = 0;i < clipnumplanes;i++)
        {
-               PolygonF_Divide(numpoints, &portaltemppoints[0][0][0], clipplanes[i].normal[0], clipplanes[i].normal[1], clipplanes[i].normal[2], clipplanes[i].dist, 1.0f/32.0f, 256, &portaltemppoints[1][0][0], &numpoints, 0, NULL, NULL);
+               PolygonF_Divide(numpoints, &portaltemppoints[0][0][0], clipplanes[i].normal[0], clipplanes[i].normal[1], clipplanes[i].normal[2], clipplanes[i].dist, 1.0f/32.0f, 256, &portaltemppoints[1][0][0], &numpoints, 0, NULL, NULL, NULL);
                if (numpoints < 3)
                        return numpoints;
                memcpy(&portaltemppoints[0][0][0], &portaltemppoints[1][0][0], numpoints * 3 * sizeof(float));
@@ -140,7 +140,6 @@ int Portal_CheckPolygon(model_t *model, vec3_t eye, float *polypoints, int numpo
 
        portal_markid++;
 
-       Mod_CheckLoaded(model);
        Portal_PolygonRecursiveMarkLeafs(model->brush.data_nodes, polypoints, numpoints);
 
        eyeleaf = model->brush.PointInLeaf(model, eye);
@@ -273,10 +272,10 @@ typedef struct portalrecursioninfo_s
        vec3_t boxmaxs;
        int numsurfaces;
        int *surfacelist;
-       qbyte *surfacepvs;
+       unsigned char *surfacepvs;
        int numleafs;
        int *leaflist;
-       qbyte *leafpvs;
+       unsigned char *leafpvs;
        model_t *model;
        vec3_t eye;
        float *updateleafsmins;
@@ -289,7 +288,7 @@ static void Portal_RecursiveFlow (portalrecursioninfo_t *info, mleaf_t *leaf, in
        mportal_t *p;
        int newpoints, i, prev;
        float dist;
-       vec3_t center, v1, v2;
+       vec3_t center;
        tinyplane_t *newplanes;
 
        for (i = 0;i < 3;i++)
@@ -326,8 +325,8 @@ static void Portal_RecursiveFlow (portalrecursioninfo_t *info, mleaf_t *leaf, in
                                                const int *elements;
                                                const float *vertex3f;
                                                float v[9], trimins[3], trimaxs[3];
-                                               vertex3f = surface->groupmesh->data_vertex3f;
-                                               elements = (surface->groupmesh->data_element3i + 3 * surface->num_firsttriangle);
+                                               vertex3f = info->model->surfmesh.data_vertex3f;
+                                               elements = (info->model->surfmesh.data_element3i + 3 * surface->num_firsttriangle);
                                                for (j = 0;j < surface->num_triangles;j++, elements += 3)
                                                {
                                                        VectorCopy(vertex3f + elements[0] * 3, v + 0);
@@ -420,7 +419,7 @@ static void Portal_RecursiveFindLeafForFlow(portalrecursioninfo_t *info, mnode_t
        }
 }
 
-void Portal_Visibility(model_t *model, const vec3_t eye, int *leaflist, qbyte *leafpvs, int *numleafspointer, int *surfacelist, qbyte *surfacepvs, int *numsurfacespointer, const mplane_t *frustumplanes, int numfrustumplanes, int exact, const float *boxmins, const float *boxmaxs, float *updateleafsmins, float *updateleafsmaxs)
+void Portal_Visibility(model_t *model, const vec3_t eye, int *leaflist, unsigned char *leafpvs, int *numleafspointer, int *surfacelist, unsigned char *surfacepvs, int *numsurfacespointer, const mplane_t *frustumplanes, int numfrustumplanes, int exact, const float *boxmins, const float *boxmaxs, float *updateleafsmins, float *updateleafsmaxs)
 {
        int i;
        portalrecursioninfo_t info;
@@ -432,8 +431,6 @@ void Portal_Visibility(model_t *model, const vec3_t eye, int *leaflist, qbyte *l
                return;
        }
 
-       Mod_CheckLoaded(model);
-
        if (!model->brush.data_nodes)
        {
                Con_Print("Portal_Visibility: not a brush model\n");