From: divverent <divverent@61c419a2-8eb2-4b30-bcec-8cead039b335>
Date: Sun, 24 May 2009 18:08:22 +0000 (+0000)
Subject: increase MAX_PORTALS, also show an error if exceeded
X-Git-Tag: svn-r421~44
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c2c3a2ed3dee8cf31d64cb8b8cf49931b0c07953;p=xonotic%2Fnetradiant.git

increase MAX_PORTALS, also show an error if exceeded


git-svn-id: svn://svn.icculus.org/netradiant/trunk@376 61c419a2-8eb2-4b30-bcec-8cead039b335
---

diff --git a/tools/quake3/q3map2/q3map2.h b/tools/quake3/q3map2/q3map2.h
index 1a63487f..3e0595cf 100644
--- a/tools/quake3/q3map2/q3map2.h
+++ b/tools/quake3/q3map2/q3map2.h
@@ -215,7 +215,7 @@ constants
 
 #define	PORTALFILE				"PRT1"
 
-#define	MAX_PORTALS				32768
+#define	MAX_PORTALS				0x20000 /* same as MAX_MAP_PORTALS */
 #define MAX_SEPERATORS			MAX_POINTS_ON_WINDING
 #define	MAX_POINTS_ON_FIXED_WINDING	24	/* ydnar: increased this from 12 at the expense of more memory */
 #define	MAX_PORTALS_ON_LEAF		1024
diff --git a/tools/quake3/q3map2/vis.c b/tools/quake3/q3map2/vis.c
index 9cbbe59c..0bc8313f 100644
--- a/tools/quake3/q3map2/vis.c
+++ b/tools/quake3/q3map2/vis.c
@@ -897,6 +897,9 @@ void LoadPortals (char *name)
 	Sys_Printf ("%6i portalclusters\n", portalclusters);
 	Sys_Printf ("%6i numportals\n", numportals);
 	Sys_Printf ("%6i numfaces\n", numfaces);
+
+	if(numportals > MAX_PORTALS)
+		Error("MAX_PORTALS");
 	
 	// these counts should take advantage of 64 bit systems automatically
 	leafbytes = ((portalclusters+63)&~63)>>3;