RomkaZVO/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/FWGS/xash3d-fwgs.git synced 2026-08-05 03:24:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

utils: mdldec: Fix resource names validity checks.

Browse Source
This commit is contained in:
Andrey Akhmichin
2025-03-24 01:40:04 +05:00
committed by Alibek Omarov
parent 091228bcb3
commit ea70989fd2
1 changed files with 35 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

75
utils/mdldec/mdldec.c
View File

@@ -75,18 +75,17 @@ static void TextureNameFix( void )
mstudiotexture_t *texture = (mstudiotexture_t *)( (byte *)texture_hdr + texture_hdr->textureindex ), *texture1; mstudiotexture_t *texture = (mstudiotexture_t *)( (byte *)texture_hdr + texture_hdr->textureindex ), *texture1;
for( i = 0; i < texture_hdr->numtextures; ++i, ++texture ) for( i = 0; i < texture_hdr->numtextures; ++i, ++texture )
{
ExtractFileName( texture->name, sizeof( texture->name )); ExtractFileName( texture->name, sizeof( texture->name ));
if( !IsValidName( texture->name ))
Q_snprintf( texture->name, sizeof( texture->name ), "MDLDEC_Texture%i.bmp", ++protected );
}
texture -= i; texture -= i;
for( i = 0; i < texture_hdr->numtextures; ++i, ++texture ) for( i = 0; i < texture_hdr->numtextures; ++i, ++texture )
{ {
if( !IsValidName( texture->name ))
{
Q_snprintf( texture->name, sizeof( texture->name ), "MDLDEC_Texture%i.bmp", ++protected );
continue;
}
counter = 0; counter = 0;
texture1 = (mstudiotexture_t *)( (byte *)texture_hdr + texture_hdr->textureindex ); texture1 = (mstudiotexture_t *)( (byte *)texture_hdr + texture_hdr->textureindex );
@@ -124,23 +123,17 @@ BodypartNameFix
*/ */
static void BodypartNameFix( void ) static void BodypartNameFix( void )
{ {
int i, j, k, len, counter, protected = 0, protected_models = 0; int i, j, k, l, len, counter, protected = 0, protected_models = 0;
qboolean hasduplicates = false; qboolean hasduplicates = false;
mstudiobodyparts_t *bodypart = (mstudiobodyparts_t *) ( (byte *)model_hdr + model_hdr->bodypartindex ); mstudiobodyparts_t *bodypart = (mstudiobodyparts_t *)( (byte *)model_hdr + model_hdr->bodypartindex );
mstudiobodyparts_t *bodypart1;
mstudiomodel_t *model, *model1; mstudiomodel_t *model, *model1;
for( i = 0; i < model_hdr->numbodyparts; ++i, ++bodypart )
ExtractFileName( bodypart->name, sizeof( bodypart->name ));
bodypart -= i;
for( i = 0; i < model_hdr->numbodyparts; ++i, ++bodypart ) for( i = 0; i < model_hdr->numbodyparts; ++i, ++bodypart )
{ {
ExtractFileName( bodypart->name, sizeof( bodypart->name ));
if( !IsValidName( bodypart->name )) if( !IsValidName( bodypart->name ))
{
Q_snprintf( bodypart->name, sizeof( bodypart->name ), "MDLDEC_Bodypart%i", ++protected ); Q_snprintf( bodypart->name, sizeof( bodypart->name ), "MDLDEC_Bodypart%i", ++protected );
continue;
}
model = (mstudiomodel_t *)( (byte *)model_hdr + bodypart->modelindex ); model = (mstudiomodel_t *)( (byte *)model_hdr + bodypart->modelindex );
@@ -148,38 +141,44 @@ static void BodypartNameFix( void )
{ {
ExtractFileName( model->name, sizeof( model->name )); ExtractFileName( model->name, sizeof( model->name ));
COM_StripExtension( model->name ); COM_StripExtension( model->name );
if( !IsValidName( model->name ))
Q_snprintf( model->name, sizeof( model->name ), "MDLDEC_Model%i", ++protected_models );
} }
}
model -= j; bodypart -= i;
for( i = 0; i < model_hdr->numbodyparts; ++i, ++bodypart )
{
model = (mstudiomodel_t *)( (byte *)model_hdr + bodypart->modelindex );
for( j = 0; j < bodypart->nummodels; ++j, ++model ) for( j = 0; j < bodypart->nummodels; ++j, ++model )
{ {
if( !IsValidName( model->name ))
{
Q_snprintf( model->name, sizeof( model->name ), "MDLDEC_Model%i", ++protected_models );
continue;
}
counter = 0; counter = 0;
model1 = (mstudiomodel_t *)( (byte *)model_hdr + bodypart->modelindex ); bodypart1 = (mstudiobodyparts_t *)( (byte *)model_hdr + model_hdr->bodypartindex );
for( k = 0; k < bodypart->nummodels; ++k, ++model1 ) for( k = 0; k < model_hdr->numbodyparts; ++k, ++bodypart1 )
{ {
if( k != j && !Q_strncmp( model1->name, model->name, sizeof( model1->name ))) model1 = (mstudiomodel_t *)( (byte *)model_hdr + bodypart1->modelindex );
for( l = 0; l < bodypart1->nummodels; ++l, ++model1 )
{ {
len = Q_snprintf( model1->name, sizeof( model1->name ), "%s_%i", model1->name, ++counter ); if( !( i==k && j==l ) && !Q_strncmp( model1->name, model->name, sizeof( model1->name )))
{
len = Q_snprintf( model1->name, sizeof( model1->name ), "%s_%i", model1->name, ++counter );
if( len == -1 ) if( len == -1 )
Q_snprintf( model1->name, sizeof( model1->name ), "MDLDEC_Model%i_%i", k, counter ); Q_snprintf( model1->name, sizeof( model1->name ), "MDLDEC_Model%i_%i", l, counter );
}
} }
}
if( counter > 0 ) if( counter > 0 )
{ {
printf( "WARNING: Sequence name \"%s\" is repeated %i times.\n", model->name, counter ); printf( "WARNING: Model name \"%s\" is repeated %i times.\n", model->name, counter );
hasduplicates = true; hasduplicates = true;
}
} }
} }
} }
@@ -209,18 +208,14 @@ static void SequenceNameFix( void )
{ {
ExtractFileName( seqdesc->label, sizeof( seqdesc->label )); ExtractFileName( seqdesc->label, sizeof( seqdesc->label ));
COM_StripExtension( seqdesc->label ); COM_StripExtension( seqdesc->label );
if( !IsValidName( seqdesc->label ))
Q_snprintf( seqdesc->label, sizeof( seqdesc->label ), "MDLDEC_Sequence%i", ++protected );
} }
seqdesc -= i; seqdesc -= i;
for( i = 0; i < model_hdr->numseq; ++i, ++seqdesc ) for( i = 0; i < model_hdr->numseq; ++i, ++seqdesc )
{ {
if( !IsValidName( seqdesc->label ))
{
Q_snprintf( seqdesc->label, sizeof( seqdesc->label ), "MDLDEC_Sequence%i", ++protected );
continue;
}
counter = 0; counter = 0;
seqdesc1 = (mstudioseqdesc_t *)( (byte *)model_hdr + model_hdr->seqindex ); seqdesc1 = (mstudioseqdesc_t *)( (byte *)model_hdr + model_hdr->seqindex );