added support for GL_ARB_texture_env_combine, currently only used on wall rendering...

[xonotic/darkplaces.git] / portals.c

diff --git a/portals.c b/portals.c
index 85a8c7d0be34533402dabab02d68b9f8f1fac838..742f6d36d04ff88355d49d59c5fceaa3bd74aaac 100644 (file)
--- a/portals.c
+++ b/portals.c
@@ -4,11 +4,15 @@
 #define MAXRECURSIVEPORTALPLANES 1024
 #define MAXRECURSIVEPORTALS 256
 
-tinyplane_t portalplanes[MAXRECURSIVEPORTALPLANES];
-int portalplanestack[MAXRECURSIVEPORTALS];
-int portalplanecount;
-int ranoutofportalplanes;
-int ranoutofportals;
+static tinyplane_t portalplanes[MAXRECURSIVEPORTALPLANES];
+static int portalplanecount;
+static int ranoutofportalplanes;
+static int ranoutofportals;
+static float portaltemppoints[2][256][3];
+static float portaltemppoints2[256][3];
+static int portal_markid = 0;
+//float viewportalpoints[16*3];
+static float boxpoints[4*3];
 
 int R_ClipPolygonToPlane(float *in, float *out, int inpoints, int maxoutpoints, tinyplane_t *p)
 {
@@ -62,9 +66,6 @@ begin:
        return outpoints;
 }
 
-float portaltemppoints[2][256][3];
-float portaltemppoints2[256][3];
-
 /*
 void R_TriangleToPlane(vec3_t point1, vec3_t point2, vec3_t point3, tinyplane_t *p)
 {
@@ -100,11 +101,12 @@ int R_PortalThroughPortalPlanes(tinyplane_t *clipplanes, int clipnumplanes, floa
        return numpoints;
 }
 
-static int portal_markid = 0;
-
 int Portal_RecursiveFlowSearch (mleaf_t *leaf, vec3_t eye, int firstclipplane, int numclipplanes)
 {
        mportal_t *p;
+       int newpoints, i, prev;
+       vec3_t center, v1, v2;
+       tinyplane_t *newplanes;
 
        if (leaf->portalmarkid == portal_markid)
                return true;
@@ -112,10 +114,6 @@ int Portal_RecursiveFlowSearch (mleaf_t *leaf, vec3_t eye, int firstclipplane, i
        // follow portals into other leafs
        for (p = leaf->portals;p;p = p->next)
        {
-               int newpoints, i, prev;
-               vec3_t center;
-               vec3_t v1, v2;
-               tinyplane_t *newplanes;
                // only flow through portals facing away from the viewer
                if (PlaneDiff(eye, (&p->plane)) < 0)
                {
@@ -165,8 +163,6 @@ int Portal_RecursiveFlowSearch (mleaf_t *leaf, vec3_t eye, int firstclipplane, i
        return false;
 }
 
-//float viewportalpoints[16*3];
-
 void Portal_PolygonRecursiveMarkLeafs(mnode_t *node, float *polypoints, int numpoints)
 {
        int i, front;
@@ -248,8 +244,6 @@ int Portal_CheckPolygon(model_t *model, vec3_t eye, float *polypoints, int numpo
        return returnvalue;
 }
 
-float boxpoints[4*3];
-
 #define Portal_MinsBoxPolygon(axis, axisvalue, x1, y1, z1, x2, y2, z2, x3, y3, z3, x4, y4, z4) \
 {\
        if (eye[(axis)] < ((axisvalue) - 0.5f))\
@@ -281,9 +275,7 @@ int Portal_CheckBox(model_t *model, vec3_t eye, vec3_t a, vec3_t b)
        if (eye[0] >= (a[0] - 1.0f) && eye[0] < (b[0] + 1.0f)
         && eye[1] >= (a[1] - 1.0f) && eye[1] < (b[1] + 1.0f)
         && eye[2] >= (a[2] - 1.0f) && eye[2] < (b[2] + 1.0f))
-       {
                return true;
-       }
 
        Portal_MinsBoxPolygon
        (