quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mbspc: decompilation: avoid writing empty texture name

Browse Source
This commit is contained in:
Garux 2023-01-15 20:30:08 +06:00
parent 0ac6b342d8
commit 18d4a0a1e7
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/mbspc/mbspc/map.c
View File

@ -887,16 +887,20 @@ qboolean WriteMapBrush(FILE *fp, mapbrush_t *brush, vec3_t origin)
rotate = ang2 - ang1; rotate = ang2 - ang1;
if (rotate < 0) rotate += 360; if (rotate < 0) rotate += 360;
if (rotate >= 360) rotate -= 360; if (rotate >= 360) rotate -= 360;
// avoid writing empty name, makes map not loadable
const char *texName = ti->texture[0] == '\0'? "NULL" : ti->texture;
//write the texture info //write the texture info
if( g_bsp2map220 ){ if( g_bsp2map220 ){
if( fprintf(fp, "%s [ %g %g %g %g ] [ %g %g %g %g ] %d %g %g", ti->texture, if( fprintf(fp, "%s [ %g %g %g %g ] [ %g %g %g %g ] %d %g %g", texName,
vecs[0][0], vecs[0][1], vecs[0][2], ti->vecs[0][3] - DotProduct( origin, vecs[0] ), vecs[0][0], vecs[0][1], vecs[0][2], ti->vecs[0][3] - DotProduct( origin, vecs[0] ),
vecs[1][0], vecs[1][1], vecs[1][2], ti->vecs[1][3] - DotProduct( origin, vecs[1] ), vecs[1][0], vecs[1][1], vecs[1][2], ti->vecs[1][3] - DotProduct( origin, vecs[1] ),
rotate, scale[0], scale[1] ) < 0 ) rotate, scale[0], scale[1] ) < 0 )
return false; return false;
} }
else{ else{
if (fprintf(fp, "%s %d %d %d", ti->texture, shift[0], shift[1], rotate) < 0) return false; if (fprintf(fp, "%s %d %d %d", texName, shift[0], shift[1], rotate) < 0) return false;
if (fprintf(fp, " %g %g", scale[0], scale[1]) < 0) return false; if (fprintf(fp, " %g %g", scale[0], scale[1]) < 0) return false;
} }