X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=portals.c;h=3b770f9ea40c79cbf4b55bf8d77bcee9e16e0d5e;hp=2f7fa32ee9f9e5739601ca6785f845d59950436a;hb=65c1200fa869c82dc83f04c5bb43d91742669c6a;hpb=f97ea4ccdc26e5c6a416a3bbd9e7db2430421928

diff --git a/portals.c b/portals.c
index 2f7fa32e..3b770f9e 100644
--- a/portals.c
+++ b/portals.c
@@ -127,7 +127,7 @@ loc0:
 	goto loc0;
 }
 
-int Portal_CheckPolygon(model_t *model, vec3_t eye, float *polypoints, int numpoints)
+int Portal_CheckPolygon(dp_model_t *model, vec3_t eye, float *polypoints, int numpoints)
 {
 	int i, prev, returnvalue;
 	mleaf_t *eyeleaf;
@@ -204,7 +204,7 @@ int Portal_CheckPolygon(model_t *model, vec3_t eye, float *polypoints, int numpo
 	}\
 }
 
-int Portal_CheckBox(model_t *model, vec3_t eye, vec3_t a, vec3_t b)
+int Portal_CheckBox(dp_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)
@@ -273,11 +273,12 @@ typedef struct portalrecursioninfo_s
 	int *surfacelist;
 	unsigned char *surfacepvs;
 	int numleafs;
+	unsigned char *visitingleafpvs; // used to prevent infinite loops
 	int *leaflist;
 	unsigned char *leafpvs;
 	unsigned char *shadowtrispvs;
 	unsigned char *lighttrispvs;
-	model_t *model;
+	dp_model_t *model;
 	vec3_t eye;
 	float *updateleafsmins;
 	float *updateleafsmaxs;
@@ -291,6 +292,12 @@ static void Portal_RecursiveFlow (portalrecursioninfo_t *info, mleaf_t *leaf, in
 	float dist;
 	vec3_t center;
 	tinyplane_t *newplanes;
+	int leafindex = leaf - info->model->brush.data_leafs;
+
+	if (CHECKPVSBIT(info->visitingleafpvs, leafindex))
+		return; // recursive loop of leafs (cmc.bsp for megatf coop)
+
+	SETPVSBIT(info->visitingleafpvs, leafindex);
 
 	for (i = 0;i < 3;i++)
 	{
@@ -301,7 +308,6 @@ static void Portal_RecursiveFlow (portalrecursioninfo_t *info, mleaf_t *leaf, in
 
 	if (info->leafpvs)
 	{
-		int leafindex = leaf - info->model->brush.data_leafs;
 		if (!CHECKPVSBIT(info->leafpvs, leafindex))
 		{
 			SETPVSBIT(info->leafpvs, leafindex);
@@ -391,6 +397,8 @@ static void Portal_RecursiveFlow (portalrecursioninfo_t *info, mleaf_t *leaf, in
 			}
 		}
 	}
+
+	CLEARPVSBIT(info->visitingleafpvs, leafindex);
 }
 
 static void Portal_RecursiveFindLeafForFlow(portalrecursioninfo_t *info, mnode_t *node)
@@ -411,7 +419,7 @@ static void Portal_RecursiveFindLeafForFlow(portalrecursioninfo_t *info, mnode_t
 	}
 }
 
-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, unsigned char *shadowtrispvs, unsigned char *lighttrispvs)
+void Portal_Visibility(dp_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, unsigned char *shadowtrispvs, unsigned char *lighttrispvs, unsigned char *visitingleafpvs)
 {
 	int i;
 	portalrecursioninfo_t info;
@@ -446,6 +454,7 @@ void Portal_Visibility(model_t *model, const vec3_t eye, int *leaflist, unsigned
 	info.surfacelist = surfacelist;
 	info.surfacepvs = surfacepvs;
 	info.numleafs = 0;
+	info.visitingleafpvs = visitingleafpvs;
 	info.leaflist = leaflist;
 	info.leafpvs = leafpvs;
 	info.model = model;