From 2d839e524f044fe928ac8b038f200021c7a1b5e7 Mon Sep 17 00:00:00 2001 From: Garux Date: Thu, 23 Jan 2020 03:50:13 +0300 Subject: [PATCH] allocate just once in CopyBrushSidesLump() --- tools/quake3/q3map2/bspfile_ibsp.c | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/tools/quake3/q3map2/bspfile_ibsp.c b/tools/quake3/q3map2/bspfile_ibsp.c index 9a15b684..b3ec8ebf 100644 --- a/tools/quake3/q3map2/bspfile_ibsp.c +++ b/tools/quake3/q3map2/bspfile_ibsp.c @@ -90,24 +90,17 @@ ibspBrushSide_t; static void CopyBrushSidesLump( ibspHeader_t *header ){ - int i; - ibspBrushSide_t *in; - bspBrushSide_t *out; - - + const ibspBrushSide_t *in = GetLump( (bspHeader_t*) header, LUMP_BRUSHSIDES ); /* get count */ numBSPBrushSides = GetLumpElements( (bspHeader_t*) header, LUMP_BRUSHSIDES, sizeof( *in ) ); - /* copy */ - in = GetLump( (bspHeader_t*) header, LUMP_BRUSHSIDES ); - for ( i = 0; i < numBSPBrushSides; i++ ) + AUTOEXPAND_BY_REALLOC_BSP( BrushSides, 1024 ); + for ( int i = 0; i < numBSPBrushSides; ++i, ++in ) { - AUTOEXPAND_BY_REALLOC( bspBrushSides, i, allocatedBSPBrushSides, 1024 ); - out = &bspBrushSides[i]; + bspBrushSide_t *out = &bspBrushSides[i]; out->planeNum = in->planeNum; out->shaderNum = in->shaderNum; out->surfaceNum = -1; - in++; } }