cgram: in hinting mode, show all correct characters in bold face

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

diff --git a/hack/hack.mon.c b/hack/hack.mon.c
index 8ee9b4706cd7f76e21785f1a1a14c453832ce79e..8dd587ecb64161aaa3490bada286f6c59c841129 100644 (file)
--- a/hack/hack.mon.c
+++ b/hack/hack.mon.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: hack.mon.c,v 1.9 2009/06/07 18:30:39 dholland Exp $    */
+/*     $NetBSD: hack.mon.c,v 1.14 2011/08/07 06:03:45 dholland Exp $   */
 
 /*
  * Copyright (c) 1985, Stichting Centrum voor Wiskunde en Informatica,
@@ -63,7 +63,7 @@
 
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: hack.mon.c,v 1.9 2009/06/07 18:30:39 dholland Exp $");
+__RCSID("$NetBSD: hack.mon.c,v 1.14 2011/08/07 06:03:45 dholland Exp $");
 #endif                         /* not lint */
 
 #include <stdlib.h>
@@ -71,17 +71,20 @@ __RCSID("$NetBSD: hack.mon.c,v 1.9 2009/06/07 18:30:39 dholland Exp $");
 #include "extern.h"
 #include "hack.mfndpos.h"
 
-#ifndef NULL
-#define        NULL    (char *) 0
-#endif
+static int warnlevel;  /* used by movemon and dochugw */
+static long lastwarntime;
+static int lastwarnlev;
 
-int             warnlevel;     /* used by movemon and dochugw */
-long            lastwarntime;
-int             lastwarnlev;
-const char           *const warnings[] = {
+static const char *const warnings[] = {
        "white", "pink", "red", "ruby", "purple", "black"
 };
 
+static int dochugw(struct monst *);
+static void mpickgold(struct monst *);
+static void mpickgems(struct monst *);
+static void dmonsfree(void);
+static int ishuman(struct monst *);
+
 void
 movemon(void)
 {
@@ -189,7 +192,7 @@ justswld(struct monst *mtmp, const char *name)
 }
 
 void
-youswld(struct monst *mtmp, int dam, int die, const char *name)
+youswld(struct monst *mtmp, int dam, unsigned int die, const char *name)
 {
        if (mtmp != u.ustuck)
                return;
@@ -206,7 +209,7 @@ youswld(struct monst *mtmp, int dam, int die, const char *name)
 #endif
 }
 
-int
+static int
 dochugw(struct monst *mtmp)
 {
        int x = mtmp->mx;
@@ -540,7 +543,7 @@ postmov:
        return (mmoved);
 }
 
-void
+static void
 mpickgold(struct monst *mtmp)
 {
        struct gold    *gold;
@@ -552,7 +555,7 @@ mpickgold(struct monst *mtmp)
        }
 }
 
-void
+static void
 mpickgems(struct monst *mtmp)
 {
        struct obj     *otmp;
@@ -746,7 +749,7 @@ relmon(struct monst *mon)
  * we do not free monsters immediately, in order to have their name available
  * shortly after their demise
  */
-struct monst   *fdmon;         /* chain of dead monsters, need not to be
+static struct monst *fdmon;    /* chain of dead monsters, need not to be
                                 * saved */
 
 void
@@ -756,13 +759,13 @@ monfree(struct monst *mtmp)
        fdmon = mtmp;
 }
 
-void
+static void
 dmonsfree(void)
 {
        struct monst   *mtmp;
        while ((mtmp = fdmon) != NULL) {
                fdmon = mtmp->nmon;
-               free((char *) mtmp);
+               free(mtmp);
        }
 }
 
@@ -845,6 +848,7 @@ killed(struct monst *mtmp)
        {
                int             ul = u.ulevel;
                int             ml = mdat->mlevel;
+               int tmp2;
 
                if (ul < 14)    /* points are given based on present and
                                 * future level */
@@ -986,7 +990,7 @@ mnexto(struct monst *mtmp)
        pmon(mtmp);
 }
 
-int
+static int
 ishuman(struct monst *mtmp)
 {
        return (mtmp->data->mlet == '@');