okseby/Quake-III-Arena
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix console tab autocomplete for exec and condump on pure servers, patch by Zack Middleton

Browse source
This commit is contained in:
Thilo Schulz 2011-02-10 19:58:20 +00:00
parent 48aef31d9e
commit 614f315ce8
7 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
code/client/cl_console.c
View file

@ -309,7 +309,7 @@ Cmd_CompleteTxtName
*/ */
void Cmd_CompleteTxtName( char *args, int argNum ) { void Cmd_CompleteTxtName( char *args, int argNum ) {
if( argNum == 2 ) { if( argNum == 2 ) {
Field_CompleteFilename( "", "txt", qfalse ); Field_CompleteFilename( "", "txt", qfalse, qtrue );
} }
} }

2
code/client/cl_main.c
View file

@ -911,7 +911,7 @@ static void CL_CompleteDemoName( char *args, int argNum )
char demoExt[ 16 ]; char demoExt[ 16 ];
Com_sprintf( demoExt, sizeof( demoExt ), ".dm_%d", PROTOCOL_VERSION ); Com_sprintf( demoExt, sizeof( demoExt ), ".dm_%d", PROTOCOL_VERSION );
Field_CompleteFilename( "demos", demoExt, qtrue ); Field_CompleteFilename( "demos", demoExt, qtrue, qfalse );
} }
} }

2
code/qcommon/cmd.c
View file

@ -784,7 +784,7 @@ Cmd_CompleteCfgName
*/ */
void Cmd_CompleteCfgName( char *args, int argNum ) { void Cmd_CompleteCfgName( char *args, int argNum ) {
if( argNum == 2 ) { if( argNum == 2 ) {
Field_CompleteFilename( "", "cfg", qfalse ); Field_CompleteFilename( "", "cfg", qfalse, qtrue );
} }
} }

6
code/qcommon/common.c
View file

@ -3303,15 +3303,15 @@ Field_CompleteFilename
=============== ===============
*/ */
void Field_CompleteFilename( const char *dir, void Field_CompleteFilename( const char *dir,
const char *ext, qboolean stripExt ) const char *ext, qboolean stripExt, qboolean allowNonPureFilesOnDisk )
{ {
matchCount = 0; matchCount = 0;
shortestMatch[ 0 ] = 0; shortestMatch[ 0 ] = 0;
FS_FilenameCompletion( dir, ext, stripExt, FindMatches ); FS_FilenameCompletion( dir, ext, stripExt, FindMatches, allowNonPureFilesOnDisk );
if( !Field_Complete( ) ) if( !Field_Complete( ) )
FS_FilenameCompletion( dir, ext, stripExt, PrintMatches ); FS_FilenameCompletion( dir, ext, stripExt, PrintMatches, allowNonPureFilesOnDisk );
} }
/* /*

12
code/qcommon/files.c
View file

@ -1862,7 +1862,7 @@ Returns a uniqued list of files that match the given criteria
from all search paths from all search paths
=============== ===============
*/ */
char **FS_ListFilteredFiles( const char *path, const char *extension, char *filter, int *numfiles ) { char **FS_ListFilteredFiles( const char *path, const char *extension, char *filter, int *numfiles, qboolean allowNonPureFilesOnDisk ) {
int nfiles; int nfiles;
char **listCopy; char **listCopy;
char *list[MAX_FOUND_FILES]; char *list[MAX_FOUND_FILES];
@ -1958,7 +1958,7 @@ char **FS_ListFilteredFiles( const char *path, const char *extension, char *filt
char *name; char *name;
// don't scan directories for files if we are pure or restricted // don't scan directories for files if we are pure or restricted
if ( fs_numServerPaks ) { if ( fs_numServerPaks && !allowNonPureFilesOnDisk ) {
continue; continue;
} else { } else {
netpath = FS_BuildOSPath( search->dir->path, search->dir->gamedir, path ); netpath = FS_BuildOSPath( search->dir->path, search->dir->gamedir, path );
@ -1995,7 +1995,7 @@ FS_ListFiles
================= =================
*/ */
char **FS_ListFiles( const char *path, const char *extension, int *numfiles ) { char **FS_ListFiles( const char *path, const char *extension, int *numfiles ) {
return FS_ListFilteredFiles( path, extension, NULL, numfiles ); return FS_ListFilteredFiles( path, extension, NULL, numfiles, qfalse );
} }
/* /*
@ -2374,7 +2374,7 @@ void FS_NewDir_f( void ) {
Com_Printf( "---------------\n" ); Com_Printf( "---------------\n" );
dirnames = FS_ListFilteredFiles( "", "", filter, &ndirs ); dirnames = FS_ListFilteredFiles( "", "", filter, &ndirs, qfalse );
FS_SortFileList(dirnames, ndirs); FS_SortFileList(dirnames, ndirs);
@ -3606,13 +3606,13 @@ void FS_Flush( fileHandle_t f ) {
} }
void FS_FilenameCompletion( const char *dir, const char *ext, void FS_FilenameCompletion( const char *dir, const char *ext,
qboolean stripExt, void(*callback)(const char *s) ) { qboolean stripExt, void(*callback)(const char *s), qboolean allowNonPureFilesOnDisk ) {
char **filenames; char **filenames;
int nfiles; int nfiles;
int i; int i;
char filename[ MAX_STRING_CHARS ]; char filename[ MAX_STRING_CHARS ];
filenames = FS_ListFilteredFiles( dir, ext, NULL, &nfiles ); filenames = FS_ListFilteredFiles( dir, ext, NULL, &nfiles, allowNonPureFilesOnDisk );
FS_SortFileList( filenames, nfiles ); FS_SortFileList( filenames, nfiles );

4
code/qcommon/qcommon.h
View file

@ -715,7 +715,7 @@ void FS_Remove( const char *osPath );
void FS_HomeRemove( const char *homePath ); void FS_HomeRemove( const char *homePath );
void FS_FilenameCompletion( const char *dir, const char *ext, void FS_FilenameCompletion( const char *dir, const char *ext,
qboolean stripExt, void(*callback)(const char *s) ); qboolean stripExt, void(*callback)(const char *s), qboolean allowNonPureFilesOnDisk );
const char *FS_GetCurrentGameDir(void); const char *FS_GetCurrentGameDir(void);
@ -739,7 +739,7 @@ void Field_Clear( field_t *edit );
void Field_AutoComplete( field_t *edit ); void Field_AutoComplete( field_t *edit );
void Field_CompleteKeyname( void ); void Field_CompleteKeyname( void );
void Field_CompleteFilename( const char *dir, void Field_CompleteFilename( const char *dir,
const char *ext, qboolean stripExt ); const char *ext, qboolean stripExt, qboolean allowNonPureFilesOnDisk );
void Field_CompleteCommand( char *cmd, void Field_CompleteCommand( char *cmd,
qboolean doCommands, qboolean doCvars ); qboolean doCommands, qboolean doCvars );

2
code/server/sv_ccmds.c
View file

@ -1253,7 +1253,7 @@ SV_CompleteMapName
*/ */
static void SV_CompleteMapName( char *args, int argNum ) { static void SV_CompleteMapName( char *args, int argNum ) {
if( argNum == 2 ) { if( argNum == 2 ) {
Field_CompleteFilename( "maps", "bsp", qtrue ); Field_CompleteFilename( "maps", "bsp", qtrue, qfalse );
} }
} }