X-Git-Url: https://git.cameronkatri.com/bsdgames-darwin.git/blobdiff_plain/a77b3f8edc13dc6efdbcf80e336689cfa1de08ab..9e7fd816e02e66962d482b02209f112e1d5789fc:/monop/print.c?ds=sidebyside

diff --git a/monop/print.c b/monop/print.c
index 0b921d77..2b0cc42d 100644
--- a/monop/print.c
+++ b/monop/print.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: print.c,v 1.4 1997/10/12 17:45:22 christos Exp $	*/
+/*	$NetBSD: print.c,v 1.12 2008/02/24 03:56:49 christos Exp $	*/
 
 /*
  * Copyright (c) 1980, 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,24 +34,23 @@
 #if 0
 static char sccsid[] = "@(#)print.c	8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: print.c,v 1.4 1997/10/12 17:45:22 christos Exp $");
+__RCSID("$NetBSD: print.c,v 1.12 2008/02/24 03:56:49 christos Exp $");
 #endif
 #endif /* not lint */
 
-# include	"monop.ext"
+#include "monop.h"
 
-static char *header = "Name      Own      Price Mg # Rent";
+static const char *header = "Name      Own      Price Mg # Rent";
 
-static void printmorg __P((SQUARE *));
+static void printmorg(const SQUARE *);
 
 /*
  *	This routine prints out the current board
  */
 void
-printboard() 
+printboard()
 {
-
-	int	i;
+	int i;
 
 	printf("%s\t%s\n", header, header);
 	for (i = 0; i < N_SQRS/2; i++) {
@@ -64,14 +59,14 @@ printboard()
 		printsq(i+N_SQRS/2, TRUE);
 	}
 }
+
 /*
  *	This routine lists where each player is.
  */
 void
-where() 
+where()
 {
-
-	int	i;
+	int i;
 
 	printf("%s Player\n", header);
 	for (i = 0; i < num_play; i++) {
@@ -82,18 +77,16 @@ where()
 		putchar('\n');
 	}
 }
+
 /*
  *	This routine prints out an individual square
  */
 void
-printsq(sqn, eoln)
-int		sqn;
-bool	eoln;
+printsq(int sqn, bool eoln)
 {
-
-	int		rnt;
-	PROP	*pp;
-	SQUARE	*sqp;
+	int rnt;
+	PROP *pp;
+	SQUARE *sqp;
 
 	sqp = &board[sqn];
 	printf("%-10.10s", sqp->name);
@@ -128,8 +121,7 @@ bool	eoln;
 					printf("0 %4d", pp->rent[0] * 2);
 			else
 				printf("H %4d", pp->rent[5]);
-		}
-		else
+		} else
 			printf("  %4d", pp->rent[0]);
 		break;
 	  case UTIL:
@@ -156,39 +148,40 @@ bool	eoln;
 		printmorg(sqp);
 		rnt = 25;
 		rnt <<= play[sqp->owner].num_rr - 1;
-		printf("%d %4d", play[sqp->owner].num_rr, 25 << (play[sqp->owner].num_rr - 1));
+		printf("%d %4d", play[sqp->owner].num_rr,
+		    25 << (play[sqp->owner].num_rr - 1));
 		break;
 	}
 	if (eoln)
 		putchar('\n');
 }
+
 /*
  *	This routine prints out the mortgage flag.
  */
 static void
 printmorg(sqp)
-SQUARE	*sqp;
+	const SQUARE *sqp;
 {
-
 	if (sqp->desc->morg)
 		printf(" * ");
 	else
 		printf("   ");
 }
+
 /*
  *	This routine lists the holdings of the player given
  */
 void
 printhold(pl)
-int	pl;
+	int pl;
 {
-
-	OWN		*op;
-	PLAY	*pp;
+	OWN *op;
+	PLAY *pp;
 
 	pp = &play[pl];
-	printf("%s's (%d) holdings (Total worth: $%d):\n", name_list[pl], pl+1,
-		pp->money + prop_worth(pp));
+	printf("%s's (%d) holdings (Total worth: $%d):\n", name_list[pl],
+	    pl + 1, pp->money + prop_worth(pp));
 	printf("\t$%d", pp->money);
 	if (pp->num_gojf) {
 		printf(", %d get-out-of-jail-free card", pp->num_gojf);