From 6f88df262c0b9d58358305ed0a51b88a7421b4be Mon Sep 17 00:00:00 2001 From: Zack Middleton Date: Mon, 11 Feb 2013 19:15:14 -0600 Subject: [PATCH] Don't add pk3dirs if connecting to a pure server Only .cfg etc would be read from pk3dirs, but they should be treated like pk3s that are not on the pure list. --- code/qcommon/files.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/code/qcommon/files.c b/code/qcommon/files.c index d970fc98..79fa7fa4 100644 --- a/code/qcommon/files.c +++ b/code/qcommon/files.c @@ -2860,11 +2860,17 @@ void FS_AddGameDirectory( const char *path, const char *dir ) { // Get .pk3 files pakfiles = Sys_ListFiles(curpath, ".pk3", NULL, &numfiles, qfalse); - // Get top level directories (we'll filter them later since the Sys_ListFiles filtering is terrible) - pakdirs = Sys_ListFiles(curpath, "/", NULL, &numdirs, qfalse); - qsort( pakfiles, numfiles, sizeof(char*), paksort ); - qsort( pakdirs, numdirs, sizeof(char *), paksort ); + + if ( fs_numServerPaks ) { + numdirs = 0; + pakdirs = NULL; + } else { + // Get top level directories (we'll filter them later since the Sys_ListFiles filtering is terrible) + pakdirs = Sys_ListFiles(curpath, "/", NULL, &numdirs, qfalse); + + qsort( pakdirs, numdirs, sizeof(char *), paksort ); + } pakfilesi = 0; pakdirsi = 0;