Merge commit 'e7c45da823515747a88569374d62717b72dcf078' into garux-merge

[xonotic/netradiant.git] / tools / quake3 / q3map2 / brush.c

diff --git a/tools/quake3/q3map2/brush.c b/tools/quake3/q3map2/brush.c
index c6400cbc1ac3fc4859e2e917a34b3516b7c754bb..7769a0c5cc4650483bb621f1e7bba07261787c01 100644 (file)
--- a/tools/quake3/q3map2/brush.c
+++ b/tools/quake3/q3map2/brush.c
@@ -94,10 +94,11 @@ brush_t *AllocBrush( int numSides ){
        size_t c;
 
        /* allocate and clear */
-       if ( numSides <= 0 ) {
+       /*if ( numSides <= 0 ) {
                Error( "AllocBrush called with numsides = %d", numSides );
        }
-       c = (size_t)&( ( (brush_t*) 0 )->sides[ numSides ] );
+       c = (size_t)&( ( (brush_t*) 0 )->sides[ numSides ] );*/
+       c = sizeof(*bb) + (numSides > 6 ? sizeof(side_t)*(numSides - 6) : 0);
        bb = safe_malloc( c );
        memset( bb, 0, c );
        if ( numthreads == 1 ) {