X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=portals.c;h=e831466a6fc98a8e57754da2ba00e74afa0603e5;hb=849c92ba2b16d3af63f04b3c2fab755f737693a9;hp=0900a34f8f6c9c6fb41dc12b53c77baaa03a8398;hpb=cfee52a1ec9db338098789cae89ae5cf1f7a6fbf;p=xonotic%2Fdarkplaces.git

diff --git a/portals.c b/portals.c
index 0900a34f..e831466a 100644
--- a/portals.c
+++ b/portals.c
@@ -128,7 +128,7 @@ loc0:
 	goto loc0;
 }
 
-int Portal_CheckPolygon(dp_model_t *model, vec3_t eye, float *polypoints, int numpoints)
+int Portal_CheckPolygon(model_t *model, vec3_t eye, float *polypoints, int numpoints)
 {
 	int i, prev, returnvalue;
 	mleaf_t *eyeleaf;
@@ -205,7 +205,7 @@ int Portal_CheckPolygon(dp_model_t *model, vec3_t eye, float *polypoints, int nu
 	}\
 }
 
-int Portal_CheckBox(dp_model_t *model, vec3_t eye, vec3_t a, vec3_t b)
+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)
@@ -279,7 +279,7 @@ typedef struct portalrecursioninfo_s
 	unsigned char *leafpvs;
 	unsigned char *shadowtrispvs;
 	unsigned char *lighttrispvs;
-	dp_model_t *model;
+	model_t *model;
 	vec3_t eye;
 	float *updateleafsmins;
 	float *updateleafsmaxs;
@@ -325,8 +325,8 @@ static void Portal_RecursiveFlow (portalrecursioninfo_t *info, mleaf_t *leaf, in
 			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;
+				qbool insidebox = BoxInsideBox(surface->mins, surface->maxs, info->boxmins, info->boxmaxs);
+				qbool addedtris = false;
 				int t, tend;
 				const int *elements;
 				const float *vertex3f;
@@ -339,7 +339,7 @@ static void Portal_RecursiveFlow (portalrecursioninfo_t *info, mleaf_t *leaf, in
 					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))
+					 && (insidebox || TriangleBBoxOverlapsBox(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;
@@ -420,7 +420,7 @@ static void Portal_RecursiveFindLeafForFlow(portalrecursioninfo_t *info, mnode_t
 	}
 }
 
-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)
+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, unsigned char *visitingleafpvs)
 {
 	int i;
 	portalrecursioninfo_t info;