speed limit 80

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

diff --git a/mille/print.c b/mille/print.c
index c9ac4f957dad664fa56a5b71abff5a4ecad39516..d711be543308f6b5786f4308720a7cbe10155d50 100644 (file)
--- a/mille/print.c
+++ b/mille/print.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: print.c,v 1.5 1997/05/23 23:09:42 jtc 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.
  *
@@ -33,27 +29,32 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)print.c    8.1 (Berkeley) 5/31/93";
 #else
-static char rcsid[] = "$NetBSD: print.c,v 1.5 1997/05/23 23:09:42 jtc 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
 
-prboard() {
+static void show_card(int, int, CARD, CARD *);
+static void show_score(int, int, int, int *);
 
-       register PLAY   *pp;
-       register int    i, j, k, temp;
+void
+prboard(void)
+{
+       PLAY    *pp;
+       int     i, j, k, temp;
 
        for (k = 0; k < 2; k++) {
                pp = &Player[k];
@@ -68,8 +69,8 @@ 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++) {
-                       register char   *name;
-                       register int            end;
+                       const char      *name;
+                       int     end;
 
                        if (pp->nummiles[i] == pp->sh_nummiles[i])
                                continue;
@@ -87,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);
@@ -104,9 +105,8 @@ prboard() {
  * show_card:
  *     Show the given card if it is different from the last one shown
  */
-show_card(y, x, c, lc)
-int            y, x;
-register CARD  c, *lc;
+static void
+show_card(int y, int x, CARD c, CARD *lc)
 {
        if (c == *lc)
                return;
@@ -115,14 +115,13 @@ register CARD     c, *lc;
        *lc = c;
 }
 
-static char    Score_fmt[] = "%4d";
+static const char Score_fmt[] = "%4d";
 
-prscore(for_real)
-register bool  for_real; 
+void
+prscore(bool for_real)
 {
-
-       register PLAY   *pp;
-       register int    x;
+       PLAY    *pp;
+       int     x;
 
        stdscr = Score;
        for (pp = Player; pp < &Player[2]; pp++) {
@@ -164,9 +163,8 @@ register bool       for_real;
  *     Show a score value if it is different from the last time we
  *     showed it.
  */
-show_score(y, x, s, ls)
-int            y, x;
-register int   s, *ls;
+static void
+show_score(int y, int x, int s, int *ls)
 {
        if (s == *ls)
                return;