From c8c2d828ded68e37954e40c3c8d4722f82d0f38a Mon Sep 17 00:00:00 2001 From: GenericHeroGuy Date: Wed, 17 Sep 2025 17:25:13 +0200 Subject: [PATCH] brap --- src/info.c | 6 +++--- src/w_wad.c | 39 --------------------------------------- src/w_wad.h | 1 - 3 files changed, 3 insertions(+), 43 deletions(-) diff --git a/src/info.c b/src/info.c index 77b0c83d9..9cef1eef2 100644 --- a/src/info.c +++ b/src/info.c @@ -158,7 +158,7 @@ void P_ResetData(INT32 flags) if (!init) { - lumpnum = W_CheckNumForLongNamePwadNoUpper("states", MAINWAD_MAIN, 0); + lumpnum = W_CheckNumForLongNamePwad("states", MAINWAD_MAIN, 0); DEH_LoadDehackedLumpPwad(MAINWAD_MAIN, lumpnum, true); } } @@ -183,7 +183,7 @@ void P_ResetData(INT32 flags) if (!init) { - lumpnum = W_CheckNumForLongNamePwadNoUpper("mobjs", MAINWAD_MAIN, 0); + lumpnum = W_CheckNumForLongNamePwad("mobjs", MAINWAD_MAIN, 0); DEH_LoadDehackedLumpPwad(MAINWAD_MAIN, lumpnum, true); } } @@ -211,7 +211,7 @@ void P_ResetData(INT32 flags) if (!init) { - lumpnum = W_CheckNumForLongNamePwadNoUpper("skincolors", MAINWAD_MAIN, 0); + lumpnum = W_CheckNumForLongNamePwad("skincolors", MAINWAD_MAIN, 0); DEH_LoadDehackedLumpPwad(MAINWAD_MAIN, lumpnum, true); } } diff --git a/src/w_wad.c b/src/w_wad.c index 4539e3e36..8420333d1 100644 --- a/src/w_wad.c +++ b/src/w_wad.c @@ -1287,45 +1287,6 @@ UINT16 W_CheckNumForLongNamePwad(const char *name, UINT16 wad, UINT16 startlump) return INT16_MAX; } -// -// Like W_CheckNumForLongNamePwad, but doesn't uppercase the search string AAAAAAAAAAAAA -// -UINT16 W_CheckNumForLongNamePwadNoUpper(const char *name, UINT16 wad, UINT16 startlump) -{ - UINT16 i; - char uname[8+1]; - UINT32 hash; - - if (!TestValidLump(wad,0)) - return INT16_MAX; - - strncpy(uname, name, sizeof uname); - strupr(uname); - hash = quickncasehash(uname, 8); // Not a mistake, legacy system for short lumpnames - - // - // scan forward - // start at 'startlump', useful parameter when there are multiple - // resources with the same name - // - if (startlump < wadfiles[wad]->numlumps) - { - lumpinfo_t *lump_p = wadfiles[wad]->lumpinfo + startlump; - for (i = startlump; i < wadfiles[wad]->numlumps; i++, lump_p++) - { - if (lump_p->hash != hash) - continue; - if (strcmp(lump_p->longname, name)) - continue; - return i; - } - - } - - // not found. - return INT16_MAX; -} - UINT16 W_CheckNumForMarkerStartPwad (const char *name, UINT16 wad, UINT16 startlump) { diff --git a/src/w_wad.h b/src/w_wad.h index 3780eddce..2bde404bf 100644 --- a/src/w_wad.h +++ b/src/w_wad.h @@ -171,7 +171,6 @@ UINT16 W_FindNextEmptyInPwad(UINT16 wad, UINT16 startlump); // checks only in on UINT16 W_CheckNumForMapPwad(const char *name, UINT32 hash, UINT16 wad, UINT16 startlump); UINT16 W_CheckNumForNamePwad(const char *name, UINT16 wad, UINT16 startlump); // checks only in one pwad UINT16 W_CheckNumForLongNamePwad(const char *name, UINT16 wad, UINT16 startlump); -UINT16 W_CheckNumForLongNamePwadNoUpper(const char *name, UINT16 wad, UINT16 startlump); /* Find the first lump after F_START for instance. */ UINT16 W_CheckNumForMarkerStartPwad(const char *name, UINT16 wad, UINT16 startlump);