cpmadevs/cnq3
0
0
Fork 0
mirror of https://bitbucket.org/CPMADevs/cnq3 synced 2025-03-13 22:23:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

lifted the directory scanning restriction that affected pure listen servers

Browse source
This commit is contained in:
myT 2018-01-25 05:11:33 +01:00
parent 79683b5ab4
commit b4b3482fd2
2 changed files with 6 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelog.txt
View file

@ -14,6 +14,8 @@ chg: on Windows, a fatal error will move the early console window to the foregro
chg: com_hunkMegs doesn't have a maximum value anymore
a value too high would reset it and the engine might fail to load with the default value
fix: lifted the directory scanning restriction that affected pure listen servers
fix: getting stuck on "Awaiting snapshot..." when the server shuts down during client connection
fix: demo playback would crash when delta entities/players had an invalid field count

24
code/qcommon/files.cpp
View file

@ -835,7 +835,7 @@ qbool FS_FilenameCompare( const char *s1, const char *s2 ) {
// returns qtrue if we allow opening the file on the real file system
static qbool FS_IsPureException( const char* filename )
static qbool FS_IsPureClientReadException( const char* filename )
{
const int l = strlen( filename );
if ( l < 5 )
@ -876,7 +876,6 @@ int FS_FOpenFileRead( const char *filename, fileHandle_t *file, qbool uniqueFILE
FILE *temp;
int l;
char demoExt[16];
qbool pureException;
hash = 0;
@ -1051,8 +1050,7 @@ int FS_FOpenFileRead( const char *filename, fileHandle_t *file, qbool uniqueFILE
// this test can make the search fail although the file is in the directory
// I had the problem on https://zerowing.idsoftware.com/bugzilla/show_bug.cgi?id=8
// turned out I used FS_FileExists instead
pureException = FS_IsPureException( filename );
if ( fs_numServerPaks && !pureException ) {
if ( fs_numServerPaks && !FS_IsPureClientReadException( filename ) ) {
continue;
}
@ -1691,7 +1689,7 @@ static int FS_AddFileToList( const char *name, char *list[MAX_FOUND_FILES], int
Returns a uniqued list of files that match the given criteria
from all search paths
*/
static char** FS_ListFilteredFilesEx( const char *path, const char *extension, const char* filter, int *numfiles, int filters, qbool respectPurity )
static char** FS_ListFilteredFiles( const char *path, const char *extension, const char* filter, int *numfiles, int filters )
{
int nfiles;
char *list[MAX_FOUND_FILES];
@ -1786,10 +1784,6 @@ static char** FS_ListFilteredFilesEx( const char *path, const char *extension, c
char **sysFiles;
char *name;
// don't scan directories for files if we are pure
if ( respectPurity && fs_numServerPaks )
continue;
netpath = FS_BuildOSPath( search->dir->path, search->dir->gamedir, path );
sysFiles = Sys_ListFiles( netpath, extension, filter, &numSysFiles, qfalse );
for ( i = 0 ; i < numSysFiles ; i++ ) {
@ -1817,16 +1811,6 @@ static char** FS_ListFilteredFilesEx( const char *path, const char *extension, c
return listCopy;
}
static char** FS_ListFilteredFiles( const char *path, const char *extension, const char* filter, int *numfiles, int filters )
{
return FS_ListFilteredFilesEx( path, extension, filter, numfiles, filters, qtrue );
}
static char** FS_ListFilteredFilesIgnorePurity( const char *path, const char *extension, const char* filter, int *numfiles, int filters )
{
return FS_ListFilteredFilesEx( path, extension, filter, numfiles, filters, qfalse );
}
/*
=================
FS_ListFiles
@ -3182,7 +3166,7 @@ void FS_FilenameCompletion( const char *dir, const char *ext, qbool stripExt,
int i;
char filename[ MAX_STRING_CHARS ];
filenames = FS_ListFilteredFilesIgnorePurity( dir, ext, NULL, &nfiles, filters );
filenames = FS_ListFilteredFiles( dir, ext, NULL, &nfiles, filters );
FS_SortFileList( filenames, nfiles );