|
|
@ -679,6 +679,21 @@ pack_t *FS_LoadPackPAK( const char *packfile, int *error ) |
|
|
|
return pack; |
|
|
|
return pack; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
|
|
|
============ |
|
|
|
|
|
|
|
FS_SortZip |
|
|
|
|
|
|
|
============ |
|
|
|
|
|
|
|
*/ |
|
|
|
|
|
|
|
static int FS_SortZip( const void *a, const void *b ) |
|
|
|
|
|
|
|
{ |
|
|
|
|
|
|
|
return Q_stricmp( ( ( zipfile_t* )a )->name, ( ( zipfile_t* )b )->name ); |
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
|
|
|
============ |
|
|
|
|
|
|
|
FS_LoadZip |
|
|
|
|
|
|
|
============ |
|
|
|
|
|
|
|
*/ |
|
|
|
static zip_t *FS_LoadZip( const char *zipfile, int *error ) |
|
|
|
static zip_t *FS_LoadZip( const char *zipfile, int *error ) |
|
|
|
{ |
|
|
|
{ |
|
|
|
int numpackfiles = 0, i; |
|
|
|
int numpackfiles = 0, i; |
|
|
@ -838,6 +853,8 @@ static zip_t *FS_LoadZip( const char *zipfile, int *error ) |
|
|
|
zip->numfiles = numpackfiles; |
|
|
|
zip->numfiles = numpackfiles; |
|
|
|
zip->files = info; |
|
|
|
zip->files = info; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
qsort( zip->files, zip->numfiles, sizeof( zipfile_t ), FS_SortZip ); |
|
|
|
|
|
|
|
|
|
|
|
#ifdef XASH_REDUCE_FD |
|
|
|
#ifdef XASH_REDUCE_FD |
|
|
|
// will reopen when needed
|
|
|
|
// will reopen when needed
|
|
|
|
close(zip->handle); |
|
|
|
close(zip->handle); |
|
|
@ -2499,15 +2516,33 @@ static searchpath_t *FS_FindFile( const char *name, int *index, qboolean gamedir |
|
|
|
} |
|
|
|
} |
|
|
|
else if( search->zip ) |
|
|
|
else if( search->zip ) |
|
|
|
{ |
|
|
|
{ |
|
|
|
int i; |
|
|
|
int left, right, middle; |
|
|
|
for( i = 0; search->zip->numfiles > i; i++) |
|
|
|
zip_t *zip; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
zip = search->zip; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// look for the file (binary search)
|
|
|
|
|
|
|
|
left = 0; |
|
|
|
|
|
|
|
right = zip->numfiles - 1; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
while( left <= right ) |
|
|
|
{ |
|
|
|
{ |
|
|
|
if( !Q_stricmp( search->zip->files[i].name, name ) ) |
|
|
|
int diff; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
middle = (left + right) / 2; |
|
|
|
|
|
|
|
diff = Q_stricmp( zip->files[middle].name, name ); |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// Found it
|
|
|
|
|
|
|
|
if( !diff ) |
|
|
|
{ |
|
|
|
{ |
|
|
|
if( index ) |
|
|
|
if( index ) *index = middle; |
|
|
|
*index = i; |
|
|
|
|
|
|
|
return search; |
|
|
|
return search; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// if we're too far in the list
|
|
|
|
|
|
|
|
if( diff > 0 ) |
|
|
|
|
|
|
|
right = middle - 1; |
|
|
|
|
|
|
|
else left = middle + 1; |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
else |
|
|
|
else |
|
|
|