From 5783c5aacece4d8fefa6f943a898b765a477b411 Mon Sep 17 00:00:00 2001 From: toaster Date: Fri, 18 Mar 2022 20:30:02 +0000 Subject: [PATCH] Only load map lumps that are WADs or have no extension # Conflicts: # src/w_wad.c --- src/p_setup.c | 2 +- src/w_wad.c | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/p_setup.c b/src/p_setup.c index 70f8a51eb..7664b4134 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -4313,7 +4313,7 @@ boolean P_LoadLevel(boolean fromnetsave, boolean reloadinggamestate) // internal game map maplumpname = G_BuildMapName(gamemap); - lastloadedmaplumpnum = W_CheckNumForName(maplumpname); + lastloadedmaplumpnum = W_CheckNumForMap(maplumpname); if (lastloadedmaplumpnum == LUMPERROR) I_Error("Map %s not found.\n", maplumpname); diff --git a/src/w_wad.c b/src/w_wad.c index af1cd0244..df8df7928 100644 --- a/src/w_wad.c +++ b/src/w_wad.c @@ -1229,7 +1229,11 @@ lumpnum_t W_CheckNumForMap(const char *name) { p = wadfiles[i]->lumpinfo + lumpNum; if (p->hash == hash && !strnicmp(name, p->name, 8)) - return (i<<16) + lumpNum; + { + const char *extension = strrchr(p->fullname, '.'); + if (!(extension && stricmp(extension, ".wad"))) + return (i<<16) + lumpNum; + } } } }