Merge branch 'based-files' into 'master'

Compare the file name only for real

See merge request STJr/SRB2!511
This commit is contained in:
Monster Iestyn 2019-08-24 15:51:11 -04:00
commit 7a199748b9

View file

@ -752,9 +752,12 @@ void Got_Filetxpak(void)
{ {
INT32 filenum = netbuffer->u.filetxpak.fileid; INT32 filenum = netbuffer->u.filetxpak.fileid;
fileneeded_t *file = &fileneeded[filenum]; fileneeded_t *file = &fileneeded[filenum];
char *filename = file->filename; char *filename;
static INT32 filetime = 0; static INT32 filetime = 0;
filename = va("%s", file->filename);
nameonly(filename);
if (!(strcmp(filename, "srb2.srb") if (!(strcmp(filename, "srb2.srb")
&& strcmp(filename, "srb2.wad") && strcmp(filename, "srb2.wad")
&& strcmp(filename, "zones.dta") && strcmp(filename, "zones.dta")
@ -765,6 +768,8 @@ void Got_Filetxpak(void)
)) ))
I_Error("Tried to download \"%s\"", filename); I_Error("Tried to download \"%s\"", filename);
filename = file->filename;
if (filenum >= fileneedednum) if (filenum >= fileneedednum)
{ {
DEBFILE(va("fileframent not needed %d>%d\n", filenum, fileneedednum)); DEBFILE(va("fileframent not needed %d>%d\n", filenum, fileneedednum));