X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=portals.c;h=759fa4d7f2ceefd757b9beb4d2273903c15bb5f1;hb=c3de890275f4840c3f4edf9a5ab047b7dd9b2a37;hp=2eae87920228a2acaeb85a03a7fc068378c8cff9;hpb=6824d8ddc8a43cae0609be5bbe8bee01fa1a4225;p=xonotic%2Fdarkplaces.git diff --git a/portals.c b/portals.c index 2eae8792..759fa4d7 100644 --- 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)); @@ -325,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);