speed limit 80

[bsdgames-darwin.git] / mille / print.c

diff --git a/mille/print.c b/mille/print.c
index dee19d4abdd75ce9f43f7c5d3362cf52b16406ce..d711be543308f6b5786f4308720a7cbe10155d50 100644 (file)
--- a/mille/print.c
+++ b/mille/print.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: print.c,v 1.6 1997/10/12 00:54:24 lukem Exp $  */
+/*     $NetBSD: print.c,v 1.18 2011/08/21 08:50:08 christos Exp $      */
 
 /*
  * Copyright (c) 1982, 1993
@@ -12,11 +12,7 @@
  * 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. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *     This product includes software developed by the University of
- *     California, Berkeley and its contributors.
- * 4. Neither the name of the University nor the names of its contributors
+ * 3. Neither the name of the University nor the names of its contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
@@ -38,21 +34,24 @@
 #if 0
 static char sccsid[] = "@(#)print.c    8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: print.c,v 1.6 1997/10/12 00:54:24 lukem Exp $");
+__RCSID("$NetBSD: print.c,v 1.18 2011/08/21 08:50:08 christos Exp $");
 #endif
 #endif /* not lint */
 
-# include      "mille.h"
+#include "mille.h"
 
 /*
  * @(#)print.c 1.1 (Berkeley) 4/1/82
  */
 
-# define       COMP_STRT       20
-# define       CARD_STRT       2
+#define COMP_STRT      20
+#define CARD_STRT      2
+
+static void show_card(int, int, CARD, CARD *);
+static void show_score(int, int, int, int *);
 
 void
-prboard()
+prboard(void)
 {
        PLAY    *pp;
        int     i, j, k, temp;
@@ -70,7 +69,7 @@ prboard()
                show_card(14, temp, pp->battle, &pp->sh_battle);
                show_card(16, temp, pp->speed, &pp->sh_speed);
                for (i = C_25; i <= C_200; i++) {
-                       char    *name;
+                       const char      *name;
                        int     end;
 
                        if (pp->nummiles[i] == pp->sh_nummiles[i])
@@ -89,7 +88,7 @@ prboard()
        pp = &Player[PLAYER];
        for (i = 0; i < HAND_SZ; i++)
                show_card(i + 6, temp, pp->hand[i], &pp->sh_hand[i]);
-       mvprintw(6, COMP_STRT + CARD_STRT, "%2d", Topcard - Deck);
+       mvprintw(6, COMP_STRT + CARD_STRT, "%2ld", (long)(Topcard - Deck));
        show_card(8, COMP_STRT + CARD_STRT, Discard, &Sh_discard);
        if (End == 1000) {
                move(EXT_Y, EXT_X);
@@ -106,10 +105,8 @@ prboard()
  * show_card:
  *     Show the given card if it is different from the last one shown
  */
-void
-show_card(y, x, c, lc)
-       int     y, x;
-       CARD    c, *lc;
+static void
+show_card(int y, int x, CARD c, CARD *lc)
 {
        if (c == *lc)
                return;
@@ -118,11 +115,10 @@ show_card(y, x, c, lc)
        *lc = c;
 }
 
-static char    Score_fmt[] = "%4d";
+static const char Score_fmt[] = "%4d";
 
 void
-prscore(for_real)
-       bool    for_real; 
+prscore(bool for_real)
 {
        PLAY    *pp;
        int     x;
@@ -167,10 +163,8 @@ prscore(for_real)
  *     Show a score value if it is different from the last time we
  *     showed it.
  */
-void
-show_score(y, x, s, ls)
-       int     y, x;
-       int     s, *ls;
+static void
+show_score(int y, int x, int s, int *ls)
 {
        if (s == *ls)
                return;