FWGS
/
xash3d-fwgs
mirror of https://github.com/FWGS/xash3d-fwgs
2
0
Fork 0
Code Issues 2 Projects Releases Wiki Activity

ref_gl: fix ParseFile calls

This commit is contained in:
Alibek Omarov 2021-10-01 20:37:52 +03:00 committed by a1batross
parent 4ba95277b9
commit 8ce448cc77
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ref_gl/gl_rmisc.c
View File

@ -35,7 +35,7 @@ static void R_ParseDetailTextures( const char *filename )
pfile = (char *)afile; pfile = (char *)afile;
// format: 'texturename' 'detailtexture' 'xScale' 'yScale' // format: 'texturename' 'detailtexture' 'xScale' 'yScale'
while(( pfile = COM_ParseFile( pfile, token )) != NULL ) while(( pfile = COM_ParseFile( pfile, token, sizeof( token ))) != NULL )
{ {
texname[0] = '\0'; texname[0] = '\0';
detail_texname[0] = '\0'; detail_texname[0] = '\0';
@ -45,26 +45,26 @@ static void R_ParseDetailTextures( const char *filename )
{ {
// NOTE: COM_ParseFile handled some symbols seperately // NOTE: COM_ParseFile handled some symbols seperately
// this code will be fix it // this code will be fix it
pfile = COM_ParseFile( pfile, token ); pfile = COM_ParseFile( pfile, token, sizeof( token ));
Q_strncat( texname, "{", sizeof( texname )); Q_strncat( texname, "{", sizeof( texname ));
Q_strncat( texname, token, sizeof( texname )); Q_strncat( texname, token, sizeof( texname ));
} }
else Q_strncpy( texname, token, sizeof( texname )); else Q_strncpy( texname, token, sizeof( texname ));
// read detailtexture name // read detailtexture name
pfile = COM_ParseFile( pfile, token ); pfile = COM_ParseFile( pfile, token, sizeof( token ));
Q_strncat( detail_texname, token, sizeof( detail_texname )); Q_strncat( detail_texname, token, sizeof( detail_texname ));
// trying the scales or '{' // trying the scales or '{'
pfile = COM_ParseFile( pfile, token ); pfile = COM_ParseFile( pfile, token, sizeof( token ));
// read second part of detailtexture name // read second part of detailtexture name
if( token[0] == '{' ) if( token[0] == '{' )
{ {
Q_strncat( detail_texname, token, sizeof( detail_texname )); Q_strncat( detail_texname, token, sizeof( detail_texname ));
pfile = COM_ParseFile( pfile, token ); // read scales pfile = COM_ParseFile( pfile, token, sizeof( token )); // read scales
Q_strncat( detail_texname, token, sizeof( detail_texname )); Q_strncat( detail_texname, token, sizeof( detail_texname ));
pfile = COM_ParseFile( pfile, token ); // parse scales pfile = COM_ParseFile( pfile, token, sizeof( token )); // parse scales
} }
Q_snprintf( detail_path, sizeof( detail_path ), "gfx/%s", detail_texname ); Q_snprintf( detail_path, sizeof( detail_path ), "gfx/%s", detail_texname );
@ -72,7 +72,7 @@ static void R_ParseDetailTextures( const char *filename )
// read scales // read scales
xScale = Q_atof( token ); xScale = Q_atof( token );
pfile = COM_ParseFile( pfile, token ); pfile = COM_ParseFile( pfile, token, sizeof( token ));
yScale = Q_atof( token ); yScale = Q_atof( token );
if( xScale <= 0.0f || yScale <= 0.0f ) if( xScale <= 0.0f || yScale <= 0.0f )