incidentalstoat/blankart
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

w_wad for lumpnums: Use bitwise and instead of addition

Browse source 
Makes the mathematical logic of what's being done clearer
This commit is contained in:
toaster 2025-09-18 12:37:44 +01:00 committed by NepDisk
parent 313e291fb6
commit 7efef93f6f
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/w_wad.c
View file

@ -1394,7 +1394,7 @@ lumpnum_t W_CheckNumForName(const char *name)
lumpnumcacheindex = (lumpnumcacheindex + 1) & (LUMPNUMCACHESIZE - 1);
memset(lumpnumcache[lumpnumcacheindex].lumpname, '\0', 32);
strncpy(lumpnumcache[lumpnumcacheindex].lumpname, name, 8);
lumpnumcache[lumpnumcacheindex].lumpnum = (i<<16)+check;
lumpnumcache[lumpnumcacheindex].lumpnum = (i << 16) | check;
return lumpnumcache[lumpnumcacheindex].lumpnum;
}
@ -1446,11 +1446,11 @@ lumpnum_t W_CheckNumForLongName(const char *name)
lumpnumcacheindex = (lumpnumcacheindex + 1) & (LUMPNUMCACHESIZE - 1);
memset(lumpnumcache[lumpnumcacheindex].lumpname, '\0', 32);
strlcpy(lumpnumcache[lumpnumcacheindex].lumpname, name, 32);
lumpnumcache[lumpnumcacheindex].lumpnum = (i << 16) + check;
lumpnumcache[lumpnumcacheindex].lumpnum = (i << 16) | check;
lumpnumcache[lumpnumcacheindex].lumphash = hash;
}
return (i << 16) + check;
return (i << 16) | check;
}
}
@ -1496,11 +1496,11 @@ lumpnum_t W_CheckNumForMap(const char *name)
lumpnumcacheindex = (lumpnumcacheindex + 1) & (LUMPNUMCACHESIZE - 1);
memset(lumpnumcache[lumpnumcacheindex].lumpname, '\0', LUMPNUMCACHENAME);
strlcpy(lumpnumcache[lumpnumcacheindex].lumpname, name, LUMPNUMCACHENAME);
lumpnumcache[lumpnumcacheindex].lumpnum = (i << 16) + check;
lumpnumcache[lumpnumcacheindex].lumpnum = (i << 16) | check;
lumpnumcache[lumpnumcacheindex].lumphash = hash;
}
return (i << 16) + check;
return (i << 16) | check;
}
}
@ -1599,7 +1599,7 @@ lumpnum_t W_CheckNumForNameInFolder(const char *lump, const char *folder)
check = W_CheckNumForLongNamePwad(lump, (UINT16)i, fsid);
if (check < feid)
{
return (i<<16) + check; // found it, in our constraints
return (i<<16) | check; // found it, in our constraints
}
}
}