diff --git a/src/p_setup.c b/src/p_setup.c index efb4874b8..234d0d27b 100644 --- a/src/p_setup.c +++ b/src/p_setup.c @@ -2840,8 +2840,8 @@ boolean P_SetupLevel(boolean skipprecip, boolean reloadinggamestate) // internal game map maplumpname = G_BuildMapName(gamemap); - lastloadedmaplumpnum = W_CheckNumForMap(maplumpname); - if (lastloadedmaplumpnum == LUMPERROR) + lastloadedmaplumpnum = W_CheckNumForName(maplumpname); + if (lastloadedmaplumpnum == INT16_MAX) I_Error("Map %s not found.\n", maplumpname); curmapvirt = vres_GetMap(lastloadedmaplumpnum); diff --git a/src/w_wad.c b/src/w_wad.c index ceef6f949..4a07f0026 100644 --- a/src/w_wad.c +++ b/src/w_wad.c @@ -1216,14 +1216,8 @@ lumpnum_t W_CheckNumForMap(const char *name) for (lumpNum = 0; lumpNum < wadfiles[i]->numlumps; lumpNum++) { p = wadfiles[i]->lumpinfo + lumpNum; - - if (p->hash != hash) - continue; - - if (strncmp(name, p->name, 8)) - continue; - - return (i<<16) + lumpNum; + if (p->hash == hash && !strncmp(name, p->name, 8)) + return (i<<16) + lumpNum; } } else if (wadfiles[i]->type == RET_PK3) @@ -1237,19 +1231,8 @@ lumpnum_t W_CheckNumForMap(const char *name) for (; lumpNum < end; lumpNum++) { p = wadfiles[i]->lumpinfo + lumpNum; - - if (p->hash != hash) - continue; - - if (strnicmp(name, p->name, 8)) - continue; - - const char *extension = strrchr(p->fullname, '.'); - - if (extension && stricmp(extension, ".wad")) - continue; - - return (i<<16) + lumpNum; + if (p->hash == hash && !strnicmp(name, p->name, 8)) + return (i<<16) + lumpNum; } } }