From: havoc <havoc@d7cf8633-e32d-0410-b094-e92efae38249>
Date: Tue, 8 Mar 2005 13:48:27 +0000 (+0000)
Subject: removed/changed a few mod_brushq1 checks
X-Git-Tag: xonotic-v0.1.0preview~5108
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=76c08423ac027c8f2c10ce2c3e78c1519c2775f5;p=xonotic%2Fdarkplaces.git

removed/changed a few mod_brushq1 checks


git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@5060 d7cf8633-e32d-0410-b094-e92efae38249
---

diff --git a/model_brush.c b/model_brush.c
index 0d5b21df..6ea7aeab 100644
--- a/model_brush.c
+++ b/model_brush.c
@@ -5566,7 +5566,7 @@ void Mod_Q3BSP_Load(model_t *mod, void *buffer)
 	Mod_Q3BSP_RecursiveFindNumLeafs(loadmodel->brush.data_nodes);
 
 	mod = loadmodel;
-	for (i = 0;i < loadmodel->brushq3.num_models;i++)
+	for (i = 0;i < loadmodel->brush.numsubmodels;i++)
 	{
 		if (i > 0)
 		{
diff --git a/model_shared.c b/model_shared.c
index 825e9837..e456f02b 100644
--- a/model_shared.c
+++ b/model_shared.c
@@ -202,11 +202,11 @@ static void mod_newmap(void)
 
 	for (i = 0;i < MAX_MOD_KNOWN;i++)
 	{
-		if (mod_known[i].name[0] && mod_known[i].type == mod_brushq1)
+		if (mod_known[i].name[0])
 		{
 			for (surfacenum = 0, surface = mod_known[i].brush.data_surfaces;surfacenum < mod_known[i].brush.num_surfaces;surfacenum++, surface++)
 			{
-				if (surface->texture->flags & SURF_LIGHTMAP)
+				if (surface->stainsamples)
 				{
 					ssize = (surface->extents[0] >> 4) + 1;
 					tsize = (surface->extents[1] >> 4) + 1;
diff --git a/portals.c b/portals.c
index ddd9bda6..89eac517 100644
--- a/portals.c
+++ b/portals.c
@@ -187,7 +187,7 @@ int Portal_CheckPolygon(model_t *model, vec3_t eye, float *polypoints, int numpo
 	vec3_t center, v1, v2;
 
 	// if there is no model, it can not block visibility
-	if (model == NULL)
+	if (model == NULL || !model->brushq1.PointInLeaf)
 		return true;
 
 	portal_markid++;