bit logic fix (trunk only)

     Fix some expressions that were supposed to use bitwise '&' but were
accidentally using logical '&&', pointed out by Keni's lint tool.  All 3
instances are in post-3.4.3 code, so don't affect the branch and don't
need a fixes entry.

diff --git a/src/dogmove.c b/src/dogmove.c
index ff5e0a586446e428ecfdef2e3d7a61cdac196dd8..2422250923f4e7269f86f766079cb7fa0d6ec79c 100644 (file)
--- a/src/dogmove.c
+++ b/src/dogmove.c
@@ -1,5 +1,4 @@
 /* NetHack 3.5 dogmove.c       $Date$  $Revision$ */
-/*     SCCS Id: @(#)dogmove.c  3.5     2008/10/20      */
 /* Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985. */
 /* NetHack may be freely redistributed.  See license for details. */
 
@@ -775,7 +774,7 @@ register int after; /* this is extra fast monster movement */
                    int mstatus;
                    register struct monst *mtmp2 = m_at(nx,ny);
                    mstatus = mdisplacem(mtmp, mtmp2, FALSE);   /* displace monster */
-                   if (mstatus && MM_DEF_DIED) return 2;
+                   if (mstatus & MM_DEF_DIED) return 2;
                    return 0;
                }
 #endif /* BARGETHROUGH */

diff --git a/src/makemon.c b/src/makemon.c
index 7607d1efd92d1077641b0cc5b7bad0561f6e53a5..98cfedb3d7e86dc96d80f18b26e511a4aac21b4a 100644 (file)
--- a/src/makemon.c
+++ b/src/makemon.c
@@ -1126,15 +1126,15 @@ register int    mmflags;
           something sensible if caller hasn't specified MM_EPRI|MM_EMIN
           (when they're specified, caller intends to handle this itself) */
        if ((mndx == PM_ALIGNED_PRIEST || mndx == PM_HIGH_PRIEST) ?
-               !(mmflags && (MM_EPRI|MM_EMIN)) :
-               (mndx == PM_ANGEL && !(mmflags && MM_EMIN) && !rn2(3))) {
+               !(mmflags & (MM_EPRI|MM_EMIN)) :
+               (mndx == PM_ANGEL && !(mmflags & MM_EMIN) && !rn2(3))) {
            struct emin *eminp;
            newemin(mtmp);
            eminp = EMIN(mtmp);
 
            mtmp->isminion = 1;         /* make priest be a roamer */
            eminp->min_align = rn2(3) - 1;      /* no A_NONE */
-           eminp->renegade = (mmflags & MM_ANGRY) ? 1 : !rn2(3);
+           eminp->renegade = (boolean)((mmflags & MM_ANGRY) ? 1 : !rn2(3));
            mtmp->mpeaceful = (eminp->min_align == u.ualign.type) ?
                                !eminp->renegade : eminp->renegade;
        }