Merge commit '1132fe233cd201e0f8eb17cb1b96313f6a5cf3ec' into master-merge

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

diff --git a/tools/quake3/q3map2/bspfile_ibsp.c b/tools/quake3/q3map2/bspfile_ibsp.c
index c4daffd94644a4a339f83368a78101bfecd63f01..433d4457d220b41afe8593ef367d966c3cad14a1 100644 (file)
--- a/tools/quake3/q3map2/bspfile_ibsp.c
+++ b/tools/quake3/q3map2/bspfile_ibsp.c
@@ -120,8 +120,7 @@ static void AddBrushSidesLump( FILE *file, ibspHeader_t *header ){
 
        /* allocate output buffer */
        size = numBSPBrushSides * sizeof( *buffer );
-       buffer = safe_malloc( size );
-       memset( buffer, 0, size );
+       buffer = safe_malloc0( size );
 
        /* convert */
        in = bspBrushSides;
@@ -232,8 +231,7 @@ static void AddDrawSurfacesLump( FILE *file, ibspHeader_t *header ){
 
        /* allocate output buffer */
        size = numBSPDrawSurfaces * sizeof( *buffer );
-       buffer = safe_malloc( size );
-       memset( buffer, 0, size );
+       buffer = safe_malloc0( size );
 
        /* convert */
        in = bspDrawSurfaces;
@@ -330,8 +328,7 @@ static void AddDrawVertsLump( FILE *file, ibspHeader_t *header ){
 
        /* allocate output buffer */
        size = numBSPDrawVerts * sizeof( *buffer );
-       buffer = safe_malloc( size );
-       memset( buffer, 0, size );
+       buffer = safe_malloc0( size );
 
        /* convert */
        in = bspDrawVerts;
@@ -385,8 +382,7 @@ static void CopyLightGridLumps( ibspHeader_t *header ){
        numBSPGridPoints = GetLumpElements( (bspHeader_t*) header, LUMP_LIGHTGRID, sizeof( *in ) );
 
        /* allocate buffer */
-       bspGridPoints = safe_malloc( numBSPGridPoints * sizeof( *bspGridPoints ) );
-       memset( bspGridPoints, 0, numBSPGridPoints * sizeof( *bspGridPoints ) );
+       bspGridPoints = safe_malloc0( numBSPGridPoints * sizeof( *bspGridPoints ) );
 
        /* copy */
        in = GetLump( (bspHeader_t*) header, LUMP_LIGHTGRID );
@@ -562,7 +558,6 @@ void WriteIBSPFile( const char *filename ){
        ibspHeader_t outheader, *header;
        FILE            *file;
        time_t t;
-       char marker[ 1024 ];
        int size;
 
 
@@ -581,9 +576,8 @@ void WriteIBSPFile( const char *filename ){
        SafeWrite( file, (bspHeader_t*) header, sizeof( *header ) );    /* overwritten later */
 
        /* add marker lump */
-       time( &t );
-       sprintf( marker, "I LOVE MY Q3MAP2 %s on %s)", Q3MAP_VERSION, asctime( localtime( &t ) ) );
-       AddLump( file, (bspHeader_t*) header, 0, marker, strlen( marker ) + 1 );
+       const char marker[] = "I LOVE MY Q3MAP2";
+       AddLump( file, header, 0, marker, strlen( marker ) + 1 );
 
        /* add lumps */
        AddLump( file, (bspHeader_t*) header, LUMP_SHADERS, bspShaders, numBSPShaders * sizeof( bspShader_t ) );