Fix merge conflicts

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

diff --git a/hack/hack.steal.c b/hack/hack.steal.c
index 3991205e7351babff4d3361ef4f8f5e71bae279c..cceb50086aa8a2874239c759e01ec305d5b6771b 100644 (file)
--- a/hack/hack.steal.c
+++ b/hack/hack.steal.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: hack.steal.c,v 1.5 2003/04/02 18:36:40 jsm Exp $       */
+/*     $NetBSD: hack.steal.c,v 1.8 2011/08/06 20:29:37 dholland Exp $  */
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,24 +63,27 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: hack.steal.c,v 1.5 2003/04/02 18:36:40 jsm Exp $");
+__RCSID("$NetBSD: hack.steal.c,v 1.8 2011/08/06 20:29:37 dholland Exp $");
 #endif                         /* not lint */
 
 #include <stdlib.h>
 #include "hack.h"
 #include "extern.h"
 
-long                           /* actually returns something that fits in an
-                                * int */
-somegold()
+static int stealarm(void);
+
+/*
+ * actually returns something that fits in an int
+ */
+long
+somegold(void)
 {
        return ((u.ugold < 100) ? u.ugold :
                (u.ugold > 10000) ? rnd(10000) : rnd((int) u.ugold));
 }
 
 void
-stealgold(mtmp)
-       struct monst   *mtmp;
+stealgold(struct monst *mtmp)
 {
        struct gold    *gold = g_at(u.ux, u.uy);
        long            tmp;
@@ -106,10 +109,10 @@ stealgold(mtmp)
 }
 
 /* steal armor after he finishes taking it off */
-unsigned        stealoid;      /* object to be stolen */
-unsigned        stealmid;      /* monster doing the stealing */
-int
-stealarm()
+static unsigned stealoid;      /* object to be stolen */
+static unsigned stealmid;      /* monster doing the stealing */
+static int
+stealarm(void)
 {
        struct monst   *mtmp;
        struct obj     *otmp;
@@ -137,8 +140,7 @@ stealarm()
 /* (or at least, when N should flee now) */
 /* avoid stealing the object stealoid */
 int
-steal(mtmp)
-       struct monst   *mtmp;
+steal(struct monst *mtmp)
 {
        struct obj     *otmp;
        int             tmp;
@@ -214,7 +216,7 @@ steal(mtmp)
        if (Punished && otmp == uball) {
                Punished = 0;
                freeobj(uchain);
-               free((char *) uchain);
+               free(uchain);
                uchain = (struct obj *) 0;
                uball->spe = 0;
                uball = (struct obj *) 0;       /* superfluous */
@@ -226,17 +228,14 @@ steal(mtmp)
 }
 
 void
-mpickobj(mtmp, otmp)
-       struct monst   *mtmp;
-       struct obj     *otmp;
+mpickobj(struct monst *mtmp, struct obj *otmp)
 {
        otmp->nobj = mtmp->minvent;
        mtmp->minvent = otmp;
 }
 
 int
-stealamulet(mtmp)
-       struct monst   *mtmp;
+stealamulet(struct monst *mtmp)
 {
        struct obj     *otmp;
 
@@ -256,9 +255,7 @@ stealamulet(mtmp)
 
 /* release the objects the killed animal has stolen */
 void
-relobj(mtmp, show)
-       struct monst   *mtmp;
-       int show;
+relobj(struct monst *mtmp, int show)
 {
        struct obj     *otmp, *otmp2;