From a01300cd54c4356f678f838bdf4f7b62dc384474 Mon Sep 17 00:00:00 2001 From: toaster Date: Thu, 18 Sep 2025 12:37:44 +0100 Subject: [PATCH] w_wad for lumpnums: Use bitwise and instead of addition Makes the mathematical logic of what's being done clearer --- src/w_wad.cpp | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/w_wad.cpp b/src/w_wad.cpp index 972b99af8..b188c2a00 100644 --- a/src/w_wad.cpp +++ b/src/w_wad.cpp @@ -1397,7 +1397,7 @@ lumpnum_t W_CheckNumForName(const char *name) lumpnumcacheindex = (lumpnumcacheindex + 1) & (LUMPNUMCACHESIZE - 1); memset(lumpnumcache[lumpnumcacheindex].lumpname, '\0', LUMPNUMCACHENAME); strncpy(lumpnumcache[lumpnumcacheindex].lumpname, name, 8); - lumpnumcache[lumpnumcacheindex].lumpnum = (i << 16) + check; + lumpnumcache[lumpnumcacheindex].lumpnum = (i << 16) | check; lumpnumcache[lumpnumcacheindex].lumphash = hash; return lumpnumcache[lumpnumcacheindex].lumpnum; @@ -1454,11 +1454,11 @@ lumpnum_t W_CheckNumForLongName(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; } } @@ -1505,11 +1505,11 @@ lumpnum_t W_CheckNumForMap(const char *name, boolean checktofirst) 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; } } @@ -1608,7 +1608,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 } } }