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

utils: mdldec: avoid double ".smd" extension output.

This commit is contained in:
Andrey Akhmichin 2023-11-22 05:00:13 +05:00 committed by Alibek Omarov
parent 8d7b9c2f01
commit c448c7b0b1
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
utils/mdldec/mdldec.c
View File

@ -75,11 +75,7 @@ static void TextureNameFix( void )
mstudiotexture_t *texture = (mstudiotexture_t *)( (byte *)texture_hdr + texture_hdr->textureindex ), *texture1;
for( i = 0; i < texture_hdr->numtextures; ++i, ++texture )
{
ExtractFileName( texture->name, sizeof( texture->name ));
if( !Q_strchr( texture->name, '.' ) )
Q_strncat( texture->name, ".bmp", sizeof( texture->name ));
}
texture -= i;
@ -149,7 +145,10 @@ static void BodypartNameFix( void )
model = (mstudiomodel_t *)( (byte *)model_hdr + bodypart->modelindex );
for( j = 0; j < bodypart->nummodels; ++j, ++model )
{
ExtractFileName( model->name, sizeof( model->name ));
COM_StripExtension( model->name );
}
model -= j;
@ -207,7 +206,10 @@ static void SequenceNameFix( void )
mstudioseqdesc_t *seqdesc = (mstudioseqdesc_t *)( (byte *)model_hdr + model_hdr->seqindex ), *seqdesc1;
for( i = 0; i < model_hdr->numseq; ++i, ++seqdesc )
{
ExtractFileName( seqdesc->label, sizeof( seqdesc->label ));
COM_StripExtension( seqdesc->label );
}
seqdesc -= i;
@ -313,18 +315,18 @@ static qboolean LoadMDL( const char *modelname )
model_hdr = (studiohdr_t *)LoadFile( modelname, &filesize );
if( filesize < sizeof( studiohdr_t ) || filesize != model_hdr->length )
{
fprintf( stderr, "ERROR: Wrong file size! File %s may be corrupted!\n", modelname );
return false;
}
if( !model_hdr )
{
fprintf( stderr, "ERROR: Can't open %s\n", modelname );
return false;
}
if( filesize < sizeof( studiohdr_t ) || filesize != model_hdr->length )
{
fprintf( stderr, "ERROR: Wrong file size! File %s may be corrupted!\n", modelname );
return false;
}
if( memcmp( &model_hdr->ident, id_mdlhdr, sizeof( id_mdlhdr ) ) )
{
if( !memcmp( &model_hdr->ident, id_seqhdr, sizeof( id_seqhdr ) ) )

2
utils/mdldec/utils.c
View File

@ -70,7 +70,7 @@ void ExtractFileName( char *name, size_t size )
if( Q_strpbrk( name, "/\\" ))
{
COM_FileBase( name, tmp, sizeof( tmp ));
Q_strncpy( tmp, COM_FileWithoutPath( name ), sizeof( tmp ));
Q_strncpy( name, tmp, size );
}
}