Fix merge conflicts

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

diff --git a/hack/hack.makemon.c b/hack/hack.makemon.c
index b2e57fd188c2b9542104b01e0f51cf384192a6b9..4872426e2a8ce285e171d784a6cece48ba71c1c4 100644 (file)
--- a/hack/hack.makemon.c
+++ b/hack/hack.makemon.c
@@ -1,18 +1,75 @@
-/*     $NetBSD: hack.makemon.c,v 1.4 1997/10/19 16:58:17 christos Exp $        */
+/*     $NetBSD: hack.makemon.c,v 1.9 2009/08/12 07:28:40 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.makemon.c,v 1.4 1997/10/19 16:58:17 christos Exp $");
+__RCSID("$NetBSD: hack.makemon.c,v 1.9 2009/08/12 07:28:40 dholland Exp $");
 #endif                         /* not lint */
 
 #include       "hack.h"
 #include       "extern.h"
 
-struct monst zeromonst;
+static const struct monst zeromonst;
 
 /*
  * called with [x,y] = coordinates;
@@ -23,11 +80,11 @@ struct monst zeromonst;
  *     note that in this case we return only one of them (the one at [x,y]).
  */
 struct monst   *
-makemon(ptr, x, y)
-       struct permonst *ptr;
+makemon(const struct permonst *ptr, int x, int y)
 {
        struct monst   *mtmp;
        int             tmp, ct;
+       unsigned        i;
        boolean         anything = (!ptr);
 
        if (x != 0 || y != 0)
@@ -61,8 +118,8 @@ makemon(ptr, x, y)
 gotmon:
        mtmp = newmonst(ptr->pxlth);
        *mtmp = zeromonst;      /* clear all entries in structure */
-       for (ct = 0; ct < ptr->pxlth; ct++)
-               ((char *) &(mtmp->mextra[0]))[ct] = 0;
+       for (i = 0; i < ptr->pxlth; i++)
+               ((char *) &(mtmp->mextra[0]))[i] = 0;
        mtmp->nmon = fmon;
        fmon = mtmp;
        mtmp->m_id = flags.ident++;
@@ -124,8 +181,7 @@ gotmon:
 }
 
 coord
-enexto(xx, yy)
-       xchar           xx, yy;
+enexto(xchar xx, xchar yy)
 {
        xchar           x, y;
        coord           foo[15], *tfoo;
@@ -169,7 +225,7 @@ foofull:
 }
 
 int
-goodpos(x, y)
+goodpos(int x, int y)
 {                              /* used only in mnexto and rloc */
        return (
                !(x < 1 || x > COLNO - 2 || y < 1 || y > ROWNO - 2 ||
@@ -180,8 +236,7 @@ goodpos(x, y)
 }
 
 void
-rloc(mtmp)
-       struct monst   *mtmp;
+rloc(struct monst *mtmp)
 {
        int             tx, ty;
        char            ch = mtmp->data->mlet;
@@ -208,12 +263,10 @@ rloc(mtmp)
 }
 
 struct monst   *
-mkmon_at(let, x, y)
-       char            let;
-       int             x, y;
+mkmon_at(int let, int x, int y)
 {
        int             ct;
-       struct permonst *ptr;
+       const struct permonst *ptr;
 
        for (ct = 0; ct < CMNUM; ct++) {
                ptr = &mons[ct];