Browse Source

filesystem: fix regression in FS_LoadFile not skipping leading slashes

Earlier it used FS_Open which handles this, but because we don't call
that anymore, just skip it ourselves for compatibility.
pull/2/head
Alibek Omarov 1 year ago
parent
commit
5a4c443c79
  1. 9
      filesystem/filesystem.c

9
filesystem/filesystem.c

@ -1913,7 +1913,7 @@ file_t *FS_Open( const char *filepath, const char *mode, qboolean gamedironly )
if( !fs_searchpaths ) if( !fs_searchpaths )
return NULL; return NULL;
// some stupid mappers used leading '/' or '\' in path to models or sounds // some mappers used leading '/' or '\' in path to models or sounds
if( filepath[0] == '/' || filepath[0] == '\\' ) if( filepath[0] == '/' || filepath[0] == '\\' )
filepath++; filepath++;
@ -2337,6 +2337,13 @@ byte *FS_LoadFile( const char *path, fs_offset_t *filesizeptr, qboolean gamediro
char netpath[MAX_SYSPATH]; char netpath[MAX_SYSPATH];
int pack_ind; int pack_ind;
// some mappers used leading '/' or '\' in path to models or sounds
if( path[0] == '/' || path[0] == '\\' )
path++;
if( path[0] == '/' || path[0] == '\\' )
path++;
if( !fs_searchpaths || FS_CheckNastyPath( path )) if( !fs_searchpaths || FS_CheckNastyPath( path ))
return NULL; return NULL;

Loading…
Cancel
Save