From 72fc8c39f434c25632fb07a8bfa4391cfccf7fe1 Mon Sep 17 00:00:00 2001
From: rpolzer <rpolzer@61c419a2-8eb2-4b30-bcec-8cead039b335>
Date: Sun, 12 Oct 2008 13:52:24 +0000
Subject: [PATCH] Sorry, have to undo the limits raising patch by mikeeusa: it
 made q3map2 no longer work for even moderately sized maps on Win32 (or any
 other system where allocating 2GB of RAM is bad).

git-svn-id: svn://svn.icculus.org/netradiant/trunk@118 61c419a2-8eb2-4b30-bcec-8cead039b335
---
 tools/quake3/q3map2/light_trace.c  |  2 +-
 tools/quake3/q3map2/q3map2.h       | 14 +++++++-------
 tools/quake3/q3map2/surface_meta.c |  2 +-
 tools/quake3/q3map2/tjunction.c    |  6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/tools/quake3/q3map2/light_trace.c b/tools/quake3/q3map2/light_trace.c
index 1b9bd5f..2a4e7e4 100644
--- a/tools/quake3/q3map2/light_trace.c
+++ b/tools/quake3/q3map2/light_trace.c
@@ -56,7 +56,7 @@ several games based on the Quake III Arena engine, in the form of "Q3Map2."
 #define GROW_TRACE_NODES		16384		//%	16384
 #define GROW_NODE_ITEMS			16			//%	256
 
-#define MAX_TW_VERTS			36
+#define MAX_TW_VERTS			12
 
 #define	TRACE_ON_EPSILON		0.1f
 
diff --git a/tools/quake3/q3map2/q3map2.h b/tools/quake3/q3map2/q3map2.h
index 87ec8d5..caf32df 100644
--- a/tools/quake3/q3map2/q3map2.h
+++ b/tools/quake3/q3map2/q3map2.h
@@ -181,7 +181,7 @@ constants
 
 /* bsp */
 #define	MAX_PATCH_SIZE			32
-#define	MAX_BRUSH_SIDES			4096
+#define	MAX_BRUSH_SIDES			1024
 #define MAX_BUILD_SIDES			300
 
 #define	MAX_EXPANDED_AXIS		128
@@ -213,7 +213,7 @@ constants
 
 #define	MAX_PORTALS				32768
 #define MAX_SEPERATORS			MAX_POINTS_ON_WINDING
-#define	MAX_POINTS_ON_FIXED_WINDING	36	/* ydnar: increased this from 12 at the expense of more memory */
+#define	MAX_POINTS_ON_FIXED_WINDING	24	/* ydnar: increased this from 12 at the expense of more memory */
 #define	MAX_PORTALS_ON_LEAF		128
 
 
@@ -303,23 +303,23 @@ abstracted bsp file
 
 /* ok to increase these at the expense of more memory */
 #define	MAX_MAP_MODELS			0x400
-#define	MAX_MAP_BRUSHES			0x10000
-#define	MAX_MAP_ENTITIES		0x8000		//%	0x800	/* ydnar */
+#define	MAX_MAP_BRUSHES			0x8000
+#define	MAX_MAP_ENTITIES		0x1000		//%	0x800	/* ydnar */
 #define	MAX_MAP_ENTSTRING		0x80000		//%	0x40000	/* ydnar */
 #define	MAX_MAP_SHADERS			0x800		//%	0x400	/* ydnar */
 
 #define	MAX_MAP_AREAS			0x100		/* MAX_MAP_AREA_BYTES in q_shared must match! */
 #define	MAX_MAP_FOGS			30			//& 0x100	/* RBSP (32 - world fog - goggles) */
-#define	MAX_MAP_PLANES			0x400000	//%	0x20000	/* ydnar for md */
+#define	MAX_MAP_PLANES			0x100000	//%	0x20000	/* ydnar for md */
 #define	MAX_MAP_NODES			0x20000
-#define	MAX_MAP_BRUSHSIDES		0x400000	//%	0x20000	/* ydnar */
+#define	MAX_MAP_BRUSHSIDES		0x100000	//%	0x20000	/* ydnar */
 #define	MAX_MAP_LEAFS			0x20000
 #define	MAX_MAP_LEAFFACES		0x100000	//%	0x20000	/* ydnar */
 #define	MAX_MAP_LEAFBRUSHES		0x40000
 #define	MAX_MAP_PORTALS			0x20000
 #define	MAX_MAP_LIGHTING		0x800000
 #define	MAX_MAP_LIGHTGRID		0x100000	//%	0x800000 /* ydnar: set to points, not bytes */
-#define	MAX_MAP_VISIBILITY		0x800000
+#define	MAX_MAP_VISIBILITY		0x200000
 
 #define	MAX_MAP_DRAW_SURFS		0x20000
 #define	MAX_MAP_DRAW_VERTS		0x80000
diff --git a/tools/quake3/q3map2/surface_meta.c b/tools/quake3/q3map2/surface_meta.c
index c9606d1..9191ac1 100644
--- a/tools/quake3/q3map2/surface_meta.c
+++ b/tools/quake3/q3map2/surface_meta.c
@@ -492,7 +492,7 @@ attempts to create a valid tri-strip w/o degenerate triangles from a brush face
 based on SurfaceAsTriStrip()
 */
 
-#define MAX_INDEXES		4096
+#define MAX_INDEXES		1024
 
 void StripFaceSurface( mapDrawSurface_t *ds ) 
 {
diff --git a/tools/quake3/q3map2/tjunction.c b/tools/quake3/q3map2/tjunction.c
index d7195d0..220e9fd 100644
--- a/tools/quake3/q3map2/tjunction.c
+++ b/tools/quake3/q3map2/tjunction.c
@@ -63,12 +63,12 @@ typedef struct {
 	bspDrawVert_t	*dv[2];
 } originalEdge_t;
 
-#define	MAX_ORIGINAL_EDGES	0x80000
+#define	MAX_ORIGINAL_EDGES	0x10000
 originalEdge_t	originalEdges[MAX_ORIGINAL_EDGES];
 int				numOriginalEdges;
 
 
-#define	MAX_EDGE_LINES		0x80000
+#define	MAX_EDGE_LINES		0x10000
 edgeLine_t		edgeLines[MAX_EDGE_LINES];
 int				numEdgeLines;
 
@@ -328,7 +328,7 @@ void AddPatchEdges( mapDrawSurface_t *ds ) {
 FixSurfaceJunctions
 ====================
 */
-#define	MAX_SURFACE_VERTS	1024
+#define	MAX_SURFACE_VERTS	256
 void FixSurfaceJunctions( mapDrawSurface_t *ds ) {
 	int			i, j, k;
 	edgeLine_t	*e;
-- 
2.39.2