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 5a8ebfb3132868428157b47270ae83a2b28dbeaf..7537454b53e4372951e9b1fe9d0a1e4b99650642 100644 (file)
--- a/hack/hack.dog.c
+++ b/hack/hack.dog.c
@@ -1,12 +1,69 @@
-/*     $NetBSD: hack.dog.c,v 1.5 2001/03/25 20:43:59 jsm Exp $ */
+/*     $NetBSD: hack.dog.c,v 1.9 2008/01/28 06:55:41 dholland Exp $    */
 
 /*
- * Copyright (c) Stichting Mathematisch Centrum, Amsterdam, 1985.
+ * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
+ * Amsterdam
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are
+ * met:
+ *
+ * - Redistributions of source code must retain the above copyright notice,
+ * this list of conditions and the following disclaimer.
+ *
+ * - Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * - Neither the name of the Stichting Centrum voor Wiskunde en
+ * Informatica, nor the names of its contributors may be used to endorse or
+ * promote products derived from this software without specific prior
+ * written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
+ * IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED
+ * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A
+ * PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER
+ * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ * PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+ * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+/*
+ * Copyright (c) 1982 Jay Fenlason <hack@gnu.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ * AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL
+ * THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
+ * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
+ * PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+ * OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
+ * OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: hack.dog.c,v 1.5 2001/03/25 20:43:59 jsm Exp $");
+__RCSID("$NetBSD: hack.dog.c,v 1.9 2008/01/28 06:55:41 dholland Exp $");
 #endif                         /* not lint */
 
 #include "hack.h"
@@ -182,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--;
@@ -198,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);
@@ -234,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;
@@ -309,6 +366,8 @@ dog_move(struct monst *mtmp, int after)
                ny = poss[i].y;
                if (info[i] & ALLOW_M) {
                        mtmp2 = m_at(nx, ny);
+                       if (mtmp2 == NULL)
+                               panic("error in dog_move");
                        if (mtmp2->data->mlevel >= mdat->mlevel + 2 ||
                            mtmp2->data->mlet == 'c')
                                continue;