Merge branch 'master' into windows

This commit is contained in:
HappyDOGE
2022-07-27 12:58:56 +03:00
3089 changed files with 38639 additions and 844820 deletions
+3 -3
View File
@@ -473,11 +473,11 @@ CPackedStore::~CPackedStore( void )
}
// Free the FindFirst cache data
m_directoryList.PurgeAndDeleteElements();
m_directoryList.PurgeAndDeleteElementsArray();
FOR_EACH_MAP( m_dirContents, i )
{
m_dirContents[i]->PurgeAndDeleteElements();
m_dirContents[i]->PurgeAndDeleteElementsArray();
delete m_dirContents[i];
}
}
@@ -502,7 +502,7 @@ void SplitFileComponents( char const *pFileName, char *pDirOut, char *pBaseOut,
if ( !pDirOut[0] )
strcpy( pDirOut, " " ); // blank dir name
V_strcpy( pBaseOut, V_UnqualifiedFileName( pFileName ) );
V_strncpy( pBaseOut, V_UnqualifiedFileName( pFileName ), MAX_PATH );
char *pDot = strrchr( pBaseOut, '.' );
if ( pDot )
{