Reset CVS keywords

[bsdgames-darwin.git] / larn / display.c

diff --git a/larn/display.c b/larn/display.c
index cb7ef552a39d5c0e8cf2dc68e3705cc5f5329591..7d437495523f6c5e2eca50d5e4d8d1a5bdfe667c 100644 (file)
--- a/larn/display.c
+++ b/larn/display.c
@@ -1,46 +1,51 @@
-/*     $NetBSD: display.c,v 1.7 2008/01/28 05:38:53 dholland Exp $     */
+/*     $NetBSD: display.c,v 1.10 2012/06/19 05:30:43 dholland Exp $    */
 
 /* display.c           Larn is copyrighted 1986 by Noah Morgan. */
 #include <sys/cdefs.h>
 #ifndef lint
-__RCSID("$NetBSD: display.c,v 1.7 2008/01/28 05:38:53 dholland Exp $");
+__RCSID("$NetBSD: display.c,v 1.10 2012/06/19 05:30:43 dholland Exp $");
 #endif /* not lint */
 
 #include "header.h"
 #include "extern.h"
+
 #define makecode(_a,_b,_c) (((_a)<<16) + ((_b)<<8) + (_c))
 
+static void bot_hpx(void);
+static void bot_spellx(void);
+static void botside(void);
 static void botsub(int, const char *);
+static void seepage(void);
 
 static int      minx, maxx, miny, maxy, k, m;
 static char     bot1f = 0, bot2f = 0, bot3f = 0;
-char            always = 0;
+static char always = 0;
 /*
        bottomline()
 
        now for the bottom line of the display
  */
 void
-bottomline()
+bottomline(void)
 {
        recalc();
        bot1f = 1;
 }
 
 void
-bottomhp()
+bottomhp(void)
 {
        bot2f = 1;
 }
 
 void
-bottomspell()
+bottomspell(void)
 {
        bot3f = 1;
 }
 
 void
-bottomdo()
+bottomdo(void)
 {
        if (bot1f) {
                bot3f = bot1f = bot2f = 0;
@@ -58,7 +63,7 @@ bottomdo()
 }
 
 void
-bot_linex()
+bot_linex(void)
 {
        int    i;
        if (cbak[SPELLS] <= -50 || (always)) {
@@ -137,7 +142,7 @@ bot_linex()
        called from ogold()
  */
 void
-bottomgold()
+bottomgold(void)
 {
        botsub(makecode(GOLD, 69, 19), "%-6ld");
        /* botsub(GOLD,"%-6ld",69,19); */
@@ -147,8 +152,8 @@ bottomgold()
        special routine to update hp and level fields on bottom lines
        called in monster.c hitplayer() and spattack()
  */
-void
-bot_hpx()
+static void
+bot_hpx(void)
 {
        if (c[EXPERIENCE] != cbak[EXPERIENCE]) {
                recalc();
@@ -160,8 +165,8 @@ bot_hpx()
 /*
        special routine to update number of spells called from regen()
  */
-void
-bot_spellx()
+static void
+bot_spellx(void)
 {
        botsub(makecode(SPELLS, 9, 18), "%2ld");
 }
@@ -194,8 +199,8 @@ static struct bot_side_def {
        { WTW, "Wall-Walk" }
 };
 
-void
-botside()
+static void
+botside(void)
 {
        int    i, idx;
        for (i = 0; i < 17; i++) {
@@ -236,11 +241,10 @@ botsub(int idx, const char *str)
  *     If entire lines are being drawn, then they will be cleared first.
  */
 /* for limited screen drawing */
-int             d_xmin = 0, d_xmax = MAXX, d_ymin = 0, d_ymax = MAXY;
+static int d_xmin = 0, d_xmax = MAXX, d_ymin = 0, d_ymax = MAXY;
 
 void
-draws(xmin, xmax, ymin, ymax)
-       int             xmin, xmax, ymin, ymax;
+draws(int xmin, int xmax, int ymin, int ymax)
 {
        int    i, idx;
        if (xmin == 0 && xmax == MAXX) {        /* clear section of screen as
@@ -275,9 +279,10 @@ draws(xmin, xmax, ymin, ymax)
 
        subroutine to redraw the whole screen as the player knows it
  */
-u_char            screen[MAXX][MAXY], d_flag;  /* template for the screen */
+u_char            screen[MAXX][MAXY];  /* template for the screen */
+static u_char d_flag;
 void
-drawscreen()
+drawscreen(void)
 {
        int    i, j, kk;
        int             lastx, lasty;   /* variables used to optimize the
@@ -370,8 +375,7 @@ drawscreen()
        subroutine to display a cell location on the screen
  */
 void
-showcell(x, y)
-       int             x, y;
+showcell(int x, int y)
 {
        int    i, j, kk, mm;
        if (c[BLINDCOUNT])
@@ -435,8 +439,7 @@ showcell(x, y)
        used in godirect() in monster.c for missile weapons display
  */
 void
-show1cell(x, y)
-       int             x, y;
+show1cell(int x, int y)
 {
        if (c[BLINDCOUNT])
                return;         /* see nothing if blind          */
@@ -469,7 +472,7 @@ show1cell(x, y)
        cursor values start from 1 up
  */
 void
-showplayer()
+showplayer(void)
 {
        cursor(playerx + 1, playery + 1);
        oldx = playerx;
@@ -488,8 +491,8 @@ showplayer()
 short           diroffx[] = {0, 0, 1, 0, -1, 1, -1, 1, -1};
 short           diroffy[] = {0, 1, 0, -1, 0, -1, -1, 1, 1};
 int
-moveplayer(dir)
-       int             dir;    /* from = present room #  direction =
+moveplayer(int dir)
+                               /* from = present room #  direction =
                                 * [1-north] [2-east] [3-south] [4-west]
                                 * [5-northeast] [6-northwest] [7-southeast]
                                 * [8-southwest] if direction=0, don't
@@ -544,8 +547,7 @@ moveplayer(dir)
  */
 static int      lincount, count;
 void
-seemagic(arg)
-       int             arg;
+seemagic(int arg)
 {
        int    i, number = 0;
        count = lincount = 0;
@@ -612,8 +614,8 @@ seemagic(arg)
 /*
  *     subroutine to paginate the seemagic function
  */
-void
-seepage()
+static void
+seepage(void)
 {
        if (++count == 3) {
                lincount++;