From: PatR <rankin@nethack.org>
Date: Fri, 28 Oct 2022 23:27:41 +0000 (-0700)
Subject: w_blocks()
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8034a0d60e2f02ffc73d5f88e092cae9c1a963da;p=nethack

w_blocks()

Add the fix that silences whatever extra warning was enabled for the
onefile testing.  The original already worked as intended.
---

diff --git a/src/worn.c b/src/worn.c
index 8e03420fa..f1ec224bd 100644
--- a/src/worn.c
+++ b/src/worn.c
@@ -34,12 +34,11 @@ const struct worn {
 
 /* This only allows for one blocking item per property */
 #define w_blocks(o, m) \
-    ((o->otyp == MUMMY_WRAPPING && ((m) & W_ARMC))                          \
-         ? INVIS                                                            \
-         : (o->otyp == CORNUTHAUM && ((m) & W_ARMH) && !Role_if(PM_WIZARD)) \
-               ? CLAIRVOYANT                                                \
-               : 0)
-/* note: monsters don't have clairvoyance, so your role
+    ((o->otyp == MUMMY_WRAPPING && ((m) & W_ARMC) != 0L) ? INVIS        \
+     : (o->otyp == CORNUTHAUM && ((m) & W_ARMH) != 0L                   \
+        && !Role_if(PM_WIZARD)) ? CLAIRVOYANT                           \
+       : 0)
+/* note: monsters don't have clairvoyance, so dependency on hero's role here
    has no significant effect on their use of w_blocks() */
 
 /* Updated to use the extrinsic and blocked fields. */