mirror of
https://github.com/FWGS/xash3d-fwgs
synced 2024-11-28 13:02:13 +01:00
engine: common: filesystem.c: do not load archives with zip extention again
This commit is contained in:
parent
89335938c1
commit
6b4f55c4bf
@ -1210,7 +1210,7 @@ static qboolean FS_AddZip_Fullpath( const char *zipfile, qboolean *already_loade
|
||||
|
||||
if( already_loaded ) *already_loaded = false;
|
||||
|
||||
if( !Q_stricmp( ext, "pk3" ) || !Q_stricmp( ext, "zip" ))
|
||||
if( !Q_stricmp( ext, "pk3" ) )
|
||||
zip = FS_LoadZip( zipfile, &errorcode );
|
||||
|
||||
if( zip )
|
||||
@ -1254,7 +1254,7 @@ static qboolean FS_AddArchive_Fullpath( const char *file, qboolean *already_load
|
||||
{
|
||||
const char *ext = COM_FileExtension( file );
|
||||
|
||||
if( !Q_stricmp( ext, "zip" ) || !Q_stricmp( ext, "pk3" ))
|
||||
if( !Q_stricmp( ext, "pk3" ) )
|
||||
return FS_AddZip_Fullpath( file, already_loaded, flags );
|
||||
else if ( !Q_stricmp( ext, "pak" ))
|
||||
return FS_AddPak_Fullpath( file, already_loaded, flags );
|
||||
@ -1297,7 +1297,7 @@ void FS_AddGameDirectory( const char *dir, uint flags )
|
||||
// add any Zip package in the directory
|
||||
for( i = 0; i < list.numstrings; i++ )
|
||||
{
|
||||
if( !Q_stricmp( COM_FileExtension( list.strings[i] ), "zip" ) || !Q_stricmp( COM_FileExtension( list.strings[i] ), "pk3" ))
|
||||
if( !Q_stricmp( COM_FileExtension( list.strings[i] ), "pk3" ) )
|
||||
{
|
||||
Q_sprintf( fullpath, "%s%s", dir, list.strings[i] );
|
||||
FS_AddZip_Fullpath( fullpath, NULL, flags );
|
||||
|
Loading…
Reference in New Issue
Block a user