diff options
Diffstat (limited to 'src/qcommon/files.c')
| -rw-r--r-- | src/qcommon/files.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/qcommon/files.c b/src/qcommon/files.c index 94779b90..7fc209e9 100644 --- a/src/qcommon/files.c +++ b/src/qcommon/files.c @@ -1054,7 +1054,7 @@ Returns filesize and an open FILE pointer. */ extern qboolean com_fullyInitialized; -long FS_FOpenFileReadDir(const char *filename, searchpath_t *search, fileHandle_t *file, qboolean uniqueFILE) +long FS_FOpenFileReadDir(const char *filename, searchpath_t *search, fileHandle_t *file, qboolean uniqueFILE, qboolean unpure) { long hash; pack_t *pak; @@ -1152,7 +1152,7 @@ long FS_FOpenFileReadDir(const char *filename, searchpath_t *search, fileHandle_ if(search->pack->hashTable[hash]) { // disregard if it doesn't match one of the allowed pure pak files - if(!FS_PakIsPure(search->pack)) + if(!unpure && !FS_PakIsPure(search->pack)) { *file = 0; return -1; @@ -1243,7 +1243,7 @@ long FS_FOpenFileReadDir(const char *filename, searchpath_t *search, fileHandle_ // 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 - if(fs_numServerPaks) + if(!unpure && fs_numServerPaks) { if(!FS_IsExt(filename, ".cfg", len) && // for config files !FS_IsExt(filename, ".menu", len) && // menu files @@ -1303,7 +1303,7 @@ long FS_FOpenFileRead(const char *filename, fileHandle_t *file, qboolean uniqueF for(search = fs_searchpaths; search; search = search->next) { - len = FS_FOpenFileReadDir(filename, search, file, uniqueFILE); + len = FS_FOpenFileReadDir(filename, search, file, uniqueFILE, qfalse); if(file == NULL) { @@ -1387,7 +1387,7 @@ vmInterpret_t FS_FindVM(void **startSearch, char *found, int foundlen, const cha } } - if(FS_FOpenFileReadDir(qvmName, search, NULL, qfalse) > 0) + if(FS_FOpenFileReadDir(qvmName, search, NULL, qfalse, qfalse) > 0) { *startSearch = search; return VMI_COMPILED; @@ -1409,7 +1409,7 @@ vmInterpret_t FS_FindVM(void **startSearch, char *found, int foundlen, const cha } } - if(FS_FOpenFileReadDir(qvmName, search, NULL, qfalse) > 0) + if(FS_FOpenFileReadDir(qvmName, search, NULL, qfalse, qfalse) > 0) { *startSearch = search; @@ -1714,7 +1714,7 @@ a null buffer will just return the file length without loading If searchPath is non-NULL search only in that specific search path ============ */ -long FS_ReadFileDir(const char *qpath, void *searchPath, void **buffer) +long FS_ReadFileDir(const char *qpath, void *searchPath, qboolean unpure, void **buffer) { fileHandle_t h; searchpath_t *search; @@ -1787,7 +1787,7 @@ long FS_ReadFileDir(const char *qpath, void *searchPath, void **buffer) else { // look for it in a specific search path only - len = FS_FOpenFileReadDir(qpath, search, &h, qfalse); + len = FS_FOpenFileReadDir(qpath, search, &h, qfalse, unpure); } if ( h == 0 ) { @@ -1846,7 +1846,7 @@ a null buffer will just return the file length without loading */ long FS_ReadFile(const char *qpath, void **buffer) { - return FS_ReadFileDir(qpath, NULL, buffer); + return FS_ReadFileDir(qpath, NULL, qfalse, buffer); } /* @@ -2713,7 +2713,7 @@ qboolean FS_Which(const char *filename, void *searchPath) { searchpath_t *search = searchPath; - if(FS_FOpenFileReadDir(filename, search, NULL, qfalse) > 0) + if(FS_FOpenFileReadDir(filename, search, NULL, qfalse, qfalse) > 0) { if(search->pack) { |