Remove clause 3 and 4 from TNF licenses

[bsdgames-darwin.git] / hack / hack.dog.c

diff --git a/hack/hack.dog.c b/hack/hack.dog.c
index 1e839c977c0d130b90edb04134a4de85759464d4..7537454b53e4372951e9b1fe9d0a1e4b99650642 100644 (file)
--- a/hack/hack.dog.c
+++ b/hack/hack.dog.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: hack.dog.c,v 1.7 2006/03/30 01:25:52 jnemeth Exp $     */
+/*     $NetBSD: hack.dog.c,v 1.9 2008/01/28 06:55:41 dholland Exp $    */
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: hack.dog.c,v 1.7 2006/03/30 01:25:52 jnemeth Exp $");
+__RCSID("$NetBSD: hack.dog.c,v 1.9 2008/01/28 06:55:41 dholland Exp $");
 #endif                         /* not lint */
 
 #include "hack.h"
@@ -239,7 +239,7 @@ dog_move(struct monst *mtmp, int after)
        /* Note: if apport == 1 then our behaviour is independent of udist */
        if (mtmp->minvent) {
                if (!rn2(udist) || !rn2((int) edog->apport))
-                       if (rn2(10) < edog->apport) {
+                       if ((unsigned) rn2(10) < edog->apport) {
                                relobj(mtmp, (int) mtmp->minvis);
                                if (edog->apport > 1)
                                        edog->apport--;
@@ -255,7 +255,7 @@ dog_move(struct monst *mtmp, int after)
                                        goto eatobj;
                                }
                                if (obj->owt < 10 * mtmp->data->mlevel)
-                                       if (rn2(20) < edog->apport + 3)
+                                       if ((unsigned) rn2(20) < edog->apport + 3)
                                                if (rn2(udist) || !rn2((int) edog->apport)) {
                                                        freeobj(obj);
                                                        unpobj(obj);
@@ -291,7 +291,7 @@ dog_move(struct monst *mtmp, int after)
                        }
                } else if (gtyp == UNDEF && dogroom >= 0 &&
                           uroom == dogroom &&
-                          !mtmp->minvent && edog->apport > rn2(8)) {
+                          !mtmp->minvent && edog->apport > (unsigned)rn2(8)) {
                        gx = obj->ox;
                        gy = obj->oy;
                        gtyp = APPORT;
@@ -366,7 +366,7 @@ dog_move(struct monst *mtmp, int after)
                ny = poss[i].y;
                if (info[i] & ALLOW_M) {
                        mtmp2 = m_at(nx, ny);
-                       if (mtmp2 = NULL)
+                       if (mtmp2 == NULL)
                                panic("error in dog_move");
                        if (mtmp2->data->mlevel >= mdat->mlevel + 2 ||
                            mtmp2->data->mlet == 'c')