From fc16e61deb6d9ba9c190609b7ed5957b650460e4 Mon Sep 17 00:00:00 2001 From: rexx <67599507+r-ex@users.noreply.github.com> Date: Mon, 8 May 2023 16:12:37 +0100 Subject: [PATCH] allow AddFilestoList to search without extension --- r5dev/public/tier2/fileutils.h | 2 +- r5dev/tier2/fileutils.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/r5dev/public/tier2/fileutils.h b/r5dev/public/tier2/fileutils.h index 6cc9d3b2..92964ba9 100644 --- a/r5dev/public/tier2/fileutils.h +++ b/r5dev/public/tier2/fileutils.h @@ -27,7 +27,7 @@ void ComputeModContentFilename( const char *pGameFileName, char *pBuf, size_t nB void RecursiveFindFilesMatchingName( CUtlVector< CUtlString > *pOutFileList, const char* szStartDirectory, const char* szTargetFileName, const char *pPathID ); // Builds a list of all files under a directory with a particular extension. -void AddFilesToList( CUtlVector< CUtlString > &list, const char *pDirectory, const char *pPath, const char *pExtension ); +void AddFilesToList( CUtlVector< CUtlString > &list, const char *pDirectory, const char *pPath = nullptr, const char *pExtension = nullptr ); // Returns the search path as a list of paths. void GetSearchPath( CUtlVector< CUtlString > &path, const char *pPathID ); diff --git a/r5dev/tier2/fileutils.cpp b/r5dev/tier2/fileutils.cpp index 9fd8457f..96a9b2a5 100644 --- a/r5dev/tier2/fileutils.cpp +++ b/r5dev/tier2/fileutils.cpp @@ -178,7 +178,7 @@ void AddFilesToList( CUtlVector< CUtlString > &list, const char *pDirectory, con } // Check the extension matches. - if ( Q_stricmp( V_GetFileExtension( pFoundFile ), pExtension ) ) + if ( pExtension && Q_stricmp( V_GetFileExtension( pFoundFile ), pExtension ) ) continue; char pFullPathBuf[MAX_PATH];