X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=portals.c;h=e831466a6fc98a8e57754da2ba00e74afa0603e5;hp=2872a8ca89c1a3faaa1fe22ef11cc8be242a1a94;hb=a66ee73e39edd25878ca5f5a58f35b125fffca29;hpb=0b2c6dc3a54096a71cc68961e27a486862408b06

diff --git a/portals.c b/portals.c
index 2872a8ca..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;
@@ -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;