From e5071bb6052c5202ce1d48ef8af6738bdf090e34 Mon Sep 17 00:00:00 2001 From: James R Date: Fri, 23 Aug 2019 11:00:05 -0700 Subject: [PATCH 1/2] Compare the file name only for real CL_SendRequestFile prepends the path for each file. --- src/d_netfil.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/d_netfil.c b/src/d_netfil.c index deb04fbe1..d25b6a278 100644 --- a/src/d_netfil.c +++ b/src/d_netfil.c @@ -752,9 +752,12 @@ void Got_Filetxpak(void) { INT32 filenum = netbuffer->u.filetxpak.fileid; fileneeded_t *file = &fileneeded[filenum]; - char *filename = file->filename; + char *filename; static INT32 filetime = 0; + filename = va("%s", file->filename); + nameonly(filename); + if (!(strcmp(filename, "srb2.srb") && strcmp(filename, "srb2.wad") && strcmp(filename, "zones.dta") @@ -765,6 +768,8 @@ void Got_Filetxpak(void) )) I_Error("Tried to download \"%s\"", filename); + filename = file->filename; + if (filenum >= fileneedednum) { DEBFILE(va("fileframent not needed %d>%d\n", filenum, fileneedednum)); From dadec1196b7df9903143b85651962b2fff34a07d Mon Sep 17 00:00:00 2001 From: Alam Ed Arias Date: Thu, 29 Aug 2019 19:27:52 -0400 Subject: [PATCH 2/2] Warn on implicit fallthrough --- src/Makefile.cfg | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Makefile.cfg b/src/Makefile.cfg index c69fcd57d..4658eb4ff 100644 --- a/src/Makefile.cfg +++ b/src/Makefile.cfg @@ -234,8 +234,7 @@ ifdef GCC61 WFLAGS+=-Wno-tautological-compare -Wno-error=tautological-compare endif ifdef GCC71 - WFLAGS+=-Wno-error=implicit-fallthrough - WFLAGS+=-Wno-implicit-fallthrough + WFLAGS+=-Wimplicit-fallthrough=4 endif ifdef GCC81 WFLAGS+=-Wno-error=format-overflow