quick/netradiant-custom
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://icculus.org/netradiant

Browse Source
This commit is contained in:
jal 2010-07-11 12:16:26 +02:00
parent 6661c1a8e8 64144b4a07
commit 8ff62be8fd
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugins/vfspk3/vfs.cpp
View File

@ -62,7 +62,7 @@ ArchiveModules& FileSystemQ3API_getArchiveModules();
#include "moduleobservers.h"
#define VFS_MAXDIRS 8
#define VFS_MAXDIRS 64
#if defined(WIN32)
#define PATH_MAX 260
@ -297,7 +297,7 @@ typedef std::set<CopiedString, PakLess> Archives;
// reads all pak files from a dir
void InitDirectory(const char* directory, ArchiveModules& archiveModules)
{
if (g_numDirs == (VFS_MAXDIRS-1))
if (g_numDirs == VFS_MAXDIRS)
return;
strncpy(g_strDirs[g_numDirs], directory, PATH_MAX);
@ -356,7 +356,7 @@ void InitDirectory(const char* directory, ArchiveModules& archiveModules)
if(ext && !string_compare_nocase_upper(ext, ".pk3dir"))
{
if (g_numDirs == (VFS_MAXDIRS-1))
if (g_numDirs == VFS_MAXDIRS)
continue;
snprintf(g_strDirs[g_numDirs], PATH_MAX, "%s%s/", path, name);
g_strDirs[g_numDirs][PATH_MAX] = '\0';

4
tools/quake3/common/vfs.c
View File

@ -169,7 +169,7 @@ void vfsInitDirectory (const char *path)
char *dirlist;
GDir *dir;
if (g_numDirs == (VFS_MAXDIRS-1))
if (g_numDirs == VFS_MAXDIRS)
return;
Sys_Printf ("VFS Init: %s\n", path);
@ -198,7 +198,7 @@ void vfsInitDirectory (const char *path)
if(ext && !Q_stricmp(ext, ".pk3dir"))
{
if (g_numDirs == (VFS_MAXDIRS-1))
if (g_numDirs == VFS_MAXDIRS)
continue;
snprintf(g_strDirs[g_numDirs], PATH_MAX, "%s/%s", path, name);
g_strDirs[g_numDirs][PATH_MAX] = '\0';