Fix merge conflicts

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

diff --git a/hack/hack.makemon.c b/hack/hack.makemon.c
index 44202cca7ad9a0833322b34ab8bcf9e8acf5a5d6..4872426e2a8ce285e171d784a6cece48ba71c1c4 100644 (file)
--- a/hack/hack.makemon.c
+++ b/hack/hack.makemon.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: hack.makemon.c,v 1.7 2008/01/28 06:55:41 dholland Exp $        */
+/*     $NetBSD: hack.makemon.c,v 1.9 2009/08/12 07:28:40 dholland Exp $        */
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,13 +63,13 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: hack.makemon.c,v 1.7 2008/01/28 06:55:41 dholland 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;
@@ -181,8 +181,7 @@ gotmon:
 }
 
 coord
-enexto(xx, yy)
-       xchar           xx, yy;
+enexto(xchar xx, xchar yy)
 {
        xchar           x, y;
        coord           foo[15], *tfoo;
@@ -237,8 +236,7 @@ goodpos(int x, int y)
 }
 
 void
-rloc(mtmp)
-       struct monst   *mtmp;
+rloc(struct monst *mtmp)
 {
        int             tx, ty;
        char            ch = mtmp->data->mlet;
@@ -265,9 +263,7 @@ rloc(mtmp)
 }
 
 struct monst   *
-mkmon_at(let, x, y)
-       char            let;
-       int             x, y;
+mkmon_at(int let, int x, int y)
 {
        int             ct;
        const struct permonst *ptr;