From 8034a0d60e2f02ffc73d5f88e092cae9c1a963da Mon Sep 17 00:00:00 2001 From: PatR Date: Fri, 28 Oct 2022 16:27:41 -0700 Subject: [PATCH] w_blocks() Add the fix that silences whatever extra warning was enabled for the onefile testing. The original already worked as intended. --- src/worn.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) 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. */ -- 2.50.1