YGGverse/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/YGGverse/xash3d-fwgs.git synced 2025-01-31 09:15:13 +00:00
Code Issues Projects Releases Wiki Activity

filesystem: zip: adapt to new interface

Browse Source
This commit is contained in:
Alibek Omarov 2023-05-27 20:48:48 +03:00
parent d0d09c878f
commit 18d55c1de2
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
filesystem/zip.c
View File

@ -420,11 +420,10 @@ FS_LoadZIPFile
=========== ===========
*/ */
byte *FS_LoadZIPFile( const char *path, fs_offset_t *sizeptr, qboolean gamedironly ) static byte *FS_LoadZIPFile( searchpath_t *search, const char *path, int pack_ind, fs_offset_t *sizeptr )
{ {
searchpath_t *search; zipfile_t *file;
int index; int index;
zipfile_t *file = NULL;
byte *compressed_buffer = NULL, *decompressed_buffer = NULL; byte *compressed_buffer = NULL, *decompressed_buffer = NULL;
int zlib_result = 0; int zlib_result = 0;
dword test_crc, final_crc; dword test_crc, final_crc;
@ -433,12 +432,7 @@ byte *FS_LoadZIPFile( const char *path, fs_offset_t *sizeptr, qboolean gamediron
if( sizeptr ) *sizeptr = 0; if( sizeptr ) *sizeptr = 0;
search = FS_FindFile( path, &index, NULL, 0, gamedironly ); file = &search->zip->files[pack_ind];
if( !search || search->type != SEARCHPATH_ZIP )
return NULL;
file = &search->zip->files[index];
FS_EnsureOpenZip( search->zip ); FS_EnsureOpenZip( search->zip );
@ -709,6 +703,7 @@ qboolean FS_AddZip_Fullpath( const char *zipfile, qboolean *already_loaded, int
search->pfnFileTime = FS_FileTime_ZIP; search->pfnFileTime = FS_FileTime_ZIP;
search->pfnFindFile = FS_FindFile_ZIP; search->pfnFindFile = FS_FindFile_ZIP;
search->pfnSearch = FS_Search_ZIP; search->pfnSearch = FS_Search_ZIP;
search->pfnLoadFile = FS_LoadZIPFile;
fs_searchpaths = search; fs_searchpaths = search;