Merge branch 'NateEag-master-patch-12920' into 'master'

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

diff --git a/tools/quake3/q3map2/patch.c b/tools/quake3/q3map2/patch.c
index 3b3949ced6ede9147272e7c0f28db19792966a98..95d478f647f3d5b0833bd8a2178aede53c5b40c0 100644 (file)
--- a/tools/quake3/q3map2/patch.c
+++ b/tools/quake3/q3map2/patch.c
@@ -348,8 +348,7 @@ void ParsePatch( qboolean onlyLights ){
        }
 
        /* allocate patch mesh */
-       pm = safe_malloc( sizeof( *pm ) );
-       memset( pm, 0, sizeof( *pm ) );
+       pm = safe_malloc0( sizeof( *pm ) );
 
        /* ydnar: add entity/brush numbering */
        pm->entityNum = mapEnt->mapEntityNum;
@@ -428,10 +427,9 @@ void PatchMapDrawSurfs( entity_t *e ){
        vec3_t bounds[ 2 ];
        byte                    *bordering;
 
-       /* ydnar: mac os x fails with these if not static */
-       MAC_STATIC parseMesh_t  *meshes[ MAX_MAP_DRAW_SURFS ];
-       MAC_STATIC qb_t grouped[ MAX_MAP_DRAW_SURFS ];
-       MAC_STATIC byte group[ MAX_MAP_DRAW_SURFS ];
+       parseMesh_t  *meshes[ MAX_MAP_DRAW_SURFS ];
+       qb_t grouped[ MAX_MAP_DRAW_SURFS ];
+       byte group[ MAX_MAP_DRAW_SURFS ];
 
 
        /* note it */
@@ -446,8 +444,7 @@ void PatchMapDrawSurfs( entity_t *e ){
        if ( !patchCount ) {
                return;
        }
-       bordering = safe_malloc( patchCount * patchCount );
-       memset( bordering, 0, patchCount * patchCount );
+       bordering = safe_malloc0( patchCount * patchCount );
 
        // build the bordering matrix
        for ( k = 0 ; k < patchCount ; k++ ) {