Sorry, have to undo the limits raising patch by mikeeusa: it made q3map2 no longer...

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

diff --git a/tools/quake3/q3map2/light_trace.c b/tools/quake3/q3map2/light_trace.c
index 1b9bd5f4a3b43a94a461f40af6b53fa27ce8402d..2a4e7e464b9fe84706f122940058a94f32ba2f41 100644 (file)
--- 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 87ec8d58d5b80388c05e781e1f7a218020efd980..caf32df95a665016b425c25bd9c48bbcfd684dbe 100644 (file)
--- 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 c9606d11b71521e5d73dcedc91f216cb97a448a8..9191ac146ed8ca47d76dea44716a4316134754fd 100644 (file)
--- 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 d7195d09bdfc71f6b8a2d794d476e6fd6ece18b4..220e9fd660c9d3622b81d63b2b124cb02de44d16 100644 (file)
--- 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;