engine: filesystem: accept ZIP files with zip extension, do not assert with NULL free in Zip_Close

This commit is contained in:
Alibek Omarov 2022-01-13 16:44:45 +03:00
parent c3513b1615
commit e29dcb4125

View File

@ -928,7 +928,8 @@ void Zip_Close( zip_t *zip )
if( !zip )
return;
Mem_Free( zip->files );
if( zip->files )
Mem_Free( zip->files );
FS_EnsureOpenZip( NULL );
@ -1209,7 +1210,7 @@ qboolean FS_AddZip_Fullpath( const char *zipfile, qboolean *already_loaded, int
if( already_loaded ) *already_loaded = false;
if( !Q_stricmp( ext, "pk3" ) )
if( !Q_stricmp( ext, "pk3" ) || !Q_stricmp( ext, "zip" ))
zip = FS_LoadZip( zipfile, &errorcode );
if( zip )