thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added W_CheckNumForMapPwad, both functions check long lump name, ignore case

Browse source
This commit is contained in:
James R 2020-10-31 18:14:25 -07:00
parent 6cda446f91
commit 64b418cb27
2 changed files with 64 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

78
src/w_wad.c
View file

@ -952,6 +952,39 @@ UINT16 W_FindNextEmptyInPwad(UINT16 wad, UINT16 startlump)
return INT16_MAX; return INT16_MAX;
} }
// Get a map marker for WADs, and a standalone WAD file lump inside PK3s.
UINT16 W_CheckNumForMapPwad(const char *name, UINT16 wad, UINT16 startlump)
{
UINT16 i, end;
if (wadfiles[wad]->type == RET_WAD)
{
for (i = startlump; i < wadfiles[wad]->numlumps; i++)
{
if (!strcasecmp(name, (wadfiles[wad]->lumpinfo + i)->name))
return i;
}
}
else if (wadfiles[wad]->type == RET_PK3)
{
i = W_CheckNumForFolderStartPK3("maps/", wad, startlump);
if (i != INT16_MAX)
{
end = W_CheckNumForFolderEndPK3("maps/", wad, i);
// Now look for the specified map.
for (; i < end; i++)
{
if (!strcasecmp(name, (wadfiles[wad]->lumpinfo + i)->longname))
return i;
}
}
}
return INT16_MAX;
}
// //
// Same as the original, but checks in one pwad only. // Same as the original, but checks in one pwad only.
// wadid is a wad number // wadid is a wad number
@ -1182,30 +1215,41 @@ lumpnum_t W_CheckNumForLongName(const char *name)
// TODO: Make it search through cache first, maybe...? // TODO: Make it search through cache first, maybe...?
lumpnum_t W_CheckNumForMap(const char *name) lumpnum_t W_CheckNumForMap(const char *name)
{ {
UINT16 lumpNum, end;
UINT32 i; UINT32 i;
lumpnum_t check = INT16_MAX;
// Check the lumpnumcache first. Loop backwards so that we check
// most recent entries first
for (i = lumpnumcacheindex + LUMPNUMCACHESIZE; i > lumpnumcacheindex; i--)
{
if (strcasecmp(lumpnumcache[i & (LUMPNUMCACHESIZE - 1)].lumpname, name) == 0)
{
lumpnumcacheindex = i & (LUMPNUMCACHESIZE - 1);
return lumpnumcache[lumpnumcacheindex].lumpnum;
}
}
for (i = numwadfiles - 1; i < numwadfiles; i--) for (i = numwadfiles - 1; i < numwadfiles; i--)
{ {
if (wadfiles[i]->type == RET_WAD) check = W_CheckNumForMapPwad(name,(UINT16)i,0);
{ if (check != INT16_MAX)
for (lumpNum = 0; lumpNum < wadfiles[i]->numlumps; lumpNum++) break; //found it
if (!strncmp(name, (wadfiles[i]->lumpinfo + lumpNum)->name, 8))
return (i<<16) + lumpNum;
} }
else if (wadfiles[i]->type == RET_PK3)
{ if (check == INT16_MAX) return LUMPERROR;
lumpNum = W_CheckNumForFolderStartPK3("maps/", i, 0);
if (lumpNum != INT16_MAX)
end = W_CheckNumForFolderEndPK3("maps/", i, lumpNum);
else else
continue; {
// Now look for the specified map. if (strlen(name) < 32)
for (; lumpNum < end; lumpNum++) {
if (!strnicmp(name, (wadfiles[i]->lumpinfo + lumpNum)->name, 8)) // Update the cache.
return (i<<16) + lumpNum; lumpnumcacheindex = (lumpnumcacheindex + 1) & (LUMPNUMCACHESIZE - 1);
memset(lumpnumcache[lumpnumcacheindex].lumpname, '\0', 32);
strlcpy(lumpnumcache[lumpnumcacheindex].lumpname, name, 32);
lumpnumcache[lumpnumcacheindex].lumpnum = (i << 16) + check;
} }
return (i << 16) + check;
} }
return LUMPERROR;
} }
// //

1
src/w_wad.h
View file

@ -160,6 +160,7 @@ const char *W_CheckNameForNum(lumpnum_t lumpnum);
UINT16 W_FindNextEmptyInPwad(UINT16 wad, UINT16 startlump); // checks only in one pwad UINT16 W_FindNextEmptyInPwad(UINT16 wad, UINT16 startlump); // checks only in one pwad
UINT16 W_CheckNumForMapPwad(const char *name, UINT16 wad, UINT16 startlump);
UINT16 W_CheckNumForNamePwad(const char *name, UINT16 wad, UINT16 startlump); // checks only in one pwad 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_CheckNumForLongNamePwad(const char *name, UINT16 wad, UINT16 startlump);