fix some recent lint

diff --git a/include/extern.h b/include/extern.h
index 3ab3e6ce4b399748564b28339c56867cac187a1b..5a229a8da16c3823614b7f1f1d01379797881e0b 100644 (file)
--- a/include/extern.h
+++ b/include/extern.h
@@ -1356,8 +1356,8 @@ E void FDECL(mnexto, (struct monst *));
 E void FDECL(maybe_mnexto, (struct monst *));
 E boolean FDECL(mnearto, (struct monst *, XCHAR_P, XCHAR_P, BOOLEAN_P));
 E void FDECL(m_respond, (struct monst *));
-E void FDECL(setmangry, (struct monst *, boolean));
-E void FDECL(wakeup, (struct monst *, boolean));
+E void FDECL(setmangry, (struct monst *, BOOLEAN_P));
+E void FDECL(wakeup, (struct monst *, BOOLEAN_P));
 E void NDECL(wake_nearby);
 E void FDECL(wake_nearto, (int, int, int));
 E void FDECL(seemimic, (struct monst *));

diff --git a/src/wield.c b/src/wield.c
index 4df6c36156f6625883392b5fb94299589492a320..585e971c918a4aafa77eefef61d76ac98fa79dcd 100644 (file)
--- a/src/wield.c
+++ b/src/wield.c
@@ -96,8 +96,9 @@ register struct obj *obj;
         if (!Blind)
             pline("%s shining.", Tobjnam(olduwep, "stop"));
     }
-    if (uwep == obj && ((uwep && uwep->oartifact == ART_OGRESMASHER)
-                        || olduwep && olduwep->oartifact == ART_OGRESMASHER))
+    if (uwep == obj
+        && ((uwep && uwep->oartifact == ART_OGRESMASHER)
+            || (olduwep && olduwep->oartifact == ART_OGRESMASHER)))
         context.botl = 1;
     /* Note: Explicitly wielding a pick-axe will not give a "bashing"
      * message.  Wielding one via 'a'pplying it will.