engine: client: only strip DEFAULT_SOUNDPATH from t_sound resources
This commit is contained in:
parent
d59875f114
commit
077be5aaf3
1 changed files with 12 additions and 15 deletions
|
@ -2510,11 +2510,6 @@ void CL_ProcessFile( qboolean successfully_received, const char *filename )
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
pfilename = filename;
|
|
||||||
|
|
||||||
if( !Q_strnicmp( filename, DEFAULT_SOUNDPATH, sound_len ))
|
|
||||||
pfilename += sound_len;
|
|
||||||
|
|
||||||
for( p = cl.resourcesneeded.pNext; p != &cl.resourcesneeded; p = p->pNext )
|
for( p = cl.resourcesneeded.pNext; p != &cl.resourcesneeded; p = p->pNext )
|
||||||
{
|
{
|
||||||
if( !Q_strnicmp( filename, "!MD5", 4 ))
|
if( !Q_strnicmp( filename, "!MD5", 4 ))
|
||||||
|
@ -2524,18 +2519,20 @@ void CL_ProcessFile( qboolean successfully_received, const char *filename )
|
||||||
if( !memcmp( p->rgucMD5_hash, rgucMD5_hash, 16 ))
|
if( !memcmp( p->rgucMD5_hash, rgucMD5_hash, 16 ))
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
else if( p->type == t_sound )
|
||||||
|
{
|
||||||
|
const char *pfilename = filename;
|
||||||
|
|
||||||
|
if( !Q_strnicmp( filename, DEFAULT_SOUNDPATH, sound_len ))
|
||||||
|
pfilename += sound_len;
|
||||||
|
|
||||||
|
if( !Q_stricmp( p->szFileName, pfilename ))
|
||||||
|
break;
|
||||||
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
if( p->type == t_generic )
|
if( !Q_stricmp( p->szFileName, filename ))
|
||||||
{
|
|
||||||
if( !Q_stricmp( p->szFileName, filename ))
|
|
||||||
break;
|
break;
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
|
||||||
if( !Q_stricmp( p->szFileName, pfilename ))
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2600,7 +2597,7 @@ void CL_ProcessFile( qboolean successfully_received, const char *filename )
|
||||||
|
|
||||||
if( cls.netchan.tempbuffer )
|
if( cls.netchan.tempbuffer )
|
||||||
{
|
{
|
||||||
Con_Printf( "Received a decal %s, but didn't find it in resources needed list!\n", pfilename );
|
Con_Printf( "Received a decal %s, but didn't find it in resources needed list!\n", filename );
|
||||||
Mem_Free( cls.netchan.tempbuffer );
|
Mem_Free( cls.netchan.tempbuffer );
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue