Half-Life-RTX
/
xash3d-fwgs
mirror of https://github.com/w23/xash3d-fwgs
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

filesystem: add size argument to COM_FileBase calls

This commit is contained in:
Alibek Omarov 2023-04-26 04:05:01 +03:00
parent 8c7db8499f
commit 1603b8028c
1 changed files with 18 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
filesystem/wad.c
View File

@ -459,16 +459,20 @@ static int FS_FindFile_WAD( searchpath_t *search, const char *path, char *fixedn
COM_ExtractFilePath( path, wadname ); COM_ExtractFilePath( path, wadname );
wadfolder[0] = '\0'; wadfolder[0] = '\0';
if( COM_CheckStringEmpty( wadname ) ) if( COM_CheckStringEmpty( wadname ))
{ {
COM_FileBase( wadname, wadname ); string wadbasename;
Q_strncpy( wadfolder, wadname, sizeof( wadfolder ));
COM_DefaultExtension( wadname, ".wad" ); COM_FileBase( wadname, wadbasename, sizeof( wadbasename ));
Q_strncpy( wadfolder, wadbasename, sizeof( wadfolder ));
Q_snprintf( wadname, sizeof( wadname ), "%s.wad", wadbasename );
anywadname = false; anywadname = false;
} }
// make wadname from wad fullpath // make wadname from wad fullpath
COM_FileBase( search->filename, shortname ); COM_FileBase( search->filename, shortname, sizeof( shortname ));
COM_DefaultExtension( shortname, ".wad" ); COM_DefaultExtension( shortname, ".wad" );
// quick reject by wadname // quick reject by wadname
@ -477,7 +481,7 @@ static int FS_FindFile_WAD( searchpath_t *search, const char *path, char *fixedn
// NOTE: we can't using long names for wad, // NOTE: we can't using long names for wad,
// because we using original wad names[16]; // because we using original wad names[16];
COM_FileBase( path, shortname ); COM_FileBase( path, shortname, sizeof( shortname ));
lump = W_FindLump( search->wad, shortname, type ); lump = W_FindLump( search->wad, shortname, type );
@ -512,19 +516,22 @@ static void FS_Search_WAD( searchpath_t *search, stringlist_t *list, const char
return; return;
COM_ExtractFilePath( pattern, wadname ); COM_ExtractFilePath( pattern, wadname );
COM_FileBase( pattern, wadpattern ); COM_FileBase( pattern, wadpattern, sizeof( wadpattern ));
wadfolder[0] = '\0'; wadfolder[0] = '\0';
if( COM_CheckStringEmpty( wadname )) if( COM_CheckStringEmpty( wadname ))
{ {
COM_FileBase( wadname, wadname ); string wadbasename;
Q_strncpy( wadfolder, wadname, sizeof( wadfolder ));
COM_DefaultExtension( wadname, ".wad" ); COM_FileBase( wadname, wadbasename, sizeof( wadbasename ));
Q_strncpy( wadfolder, wadbasename, sizeof( wadfolder ));
Q_snprintf( wadname, sizeof( wadname ), "%s.wad", wadbasename );
anywadname = false; anywadname = false;
} }
// make wadname from wad fullpath // make wadname from wad fullpath
COM_FileBase( search->filename, temp2 ); COM_FileBase( search->filename, temp2, sizeof( temp2 ));
COM_DefaultExtension( temp2, ".wad" ); COM_DefaultExtension( temp2, ".wad" );
// quick reject by wadname // quick reject by wadname