X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=tools%2Fquake3%2Fq3map2%2Fmodel.c;h=b9760e2e39c0b3f23869cf40be5fe495dc436c7b;hb=HEAD;hp=6bbbe5c532c1b1b3d11b8413bd8ae648f6e502e1;hpb=ddee6cbe7c5fcbba52e7881a411f310809b867f9;p=xonotic%2Fnetradiant.git diff --git a/tools/quake3/q3map2/model.c b/tools/quake3/q3map2/model.c index 6bbbe5c5..b9760e2e 100644 --- a/tools/quake3/q3map2/model.c +++ b/tools/quake3/q3map2/model.c @@ -230,7 +230,8 @@ void InsertModel( const char *name, int skin, int frame, m4x4_t transform, remap char *skinfilecontent; int skinfilesize; char *skinfileptr, *skinfilenextptr; - int ok=0, notok=0, spf = ( spawnFlags & 8088 ); + //int ok=0, notok=0; + int spf = ( spawnFlags & 8088 ); float limDepth=0; @@ -447,12 +448,10 @@ void InsertModel( const char *name, int skin, int frame, m4x4_t transform, remap /* set particulars */ ds->numVerts = PicoGetSurfaceNumVertexes( surface ); - ds->verts = safe_malloc( ds->numVerts * sizeof( ds->verts[ 0 ] ) ); - memset( ds->verts, 0, ds->numVerts * sizeof( ds->verts[ 0 ] ) ); + ds->verts = safe_malloc0( ds->numVerts * sizeof( ds->verts[ 0 ] ) ); ds->numIndexes = PicoGetSurfaceNumIndexes( surface ); - ds->indexes = safe_malloc( ds->numIndexes * sizeof( ds->indexes[ 0 ] ) ); - memset( ds->indexes, 0, ds->numIndexes * sizeof( ds->indexes[ 0 ] ) ); + ds->indexes = safe_malloc0( ds->numIndexes * sizeof( ds->indexes[ 0 ] ) ); /* copy vertexes */ for ( i = 0; i < ds->numVerts; i++ ) @@ -543,7 +542,7 @@ void InsertModel( const char *name, int skin, int frame, m4x4_t transform, remap ( spf == 5632 ) || //EXTRUDE_DOWNWARDS+EXTRUDE_UPWARDS+AXIAL_BACKPLANE ( spf == 3072 ) || //EXTRUDE_UPWARDS+MAX_EXTRUDE ( spf == 5120 ) ){ //EXTRUDE_UPWARDS+AXIAL_BACKPLANE - vec3_t points[ 4 ], backs[ 3 ], cnt, bestNormal, nrm, Vnorm[3], Enorm[3]; + vec3_t points[ 4 ], cnt, bestNormal, nrm, Vnorm[3], Enorm[3]; vec4_t plane, reverse, p[3]; double normalEpsilon_save; qboolean snpd;