Fixed wrong use of datatypes. In wait_for(), a char was used together

[bsdgames-darwin.git] / monop / jail.c

diff --git a/monop/jail.c b/monop/jail.c
index b976b1197036e7b1782e4da42de7b6ebb0c13e8f..f6ad097973e3b1726d7a6f2a8eb5a825f7e6e4fb 100644 (file)
--- a/monop/jail.c
+++ b/monop/jail.c
@@ -1,6 +1,8 @@
+/*     $NetBSD: jail.c,v 1.6 2003/08/07 09:37:28 agc Exp $     */
+
 /*
- * Copyright (c) 1980 Regents of the University of California.
- * All rights reserved.
+ * Copyright (c) 1980, 1993
+ *     The Regents of the University of California.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
@@ -10,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.
  *
@@ -31,19 +29,24 @@
  * SUCH DAMAGE.
  */
 
+#include <sys/cdefs.h>
 #ifndef lint
-/*static char sccsid[] = "from: @(#)jail.c     5.3 (Berkeley) 6/1/90";*/
-static char rcsid[] = "$Id: jail.c,v 1.2 1993/08/01 18:53:38 mycroft Exp $";
+#if 0
+static char sccsid[] = "@(#)jail.c     8.1 (Berkeley) 5/31/93";
+#else
+__RCSID("$NetBSD: jail.c,v 1.6 2003/08/07 09:37:28 agc Exp $");
+#endif
 #endif /* not lint */
 
-# include      "monop.ext"
+#include "monop.ext"
 
 /*
  *     This routine uses a get-out-of-jail-free card to get the
  * player out of jail.
  */
-card() {
-
+void
+card()
+{
        if (cur_p->loc != JAIL) {
                printf("But you're not IN Jail\n");
                return;
@@ -56,24 +59,28 @@ card() {
        cur_p->loc = 10;                        /* just visiting        */
        cur_p->in_jail = 0;
 }
+
 /*
  *     This routine returns the players get-out-of-jail-free card
  * to a deck.
  */
+void
 ret_card(plr)
-reg PLAY       *plr; {
-
+       PLAY *plr;
+{
        plr->num_gojf--;
        if (CC_D.gojf_used)
                CC_D.gojf_used = FALSE;
        else
                CH_D.gojf_used = FALSE;
 }
+
 /*
  *     This routine deals with paying your way out of jail.
  */
-pay() {
-
+void
+pay()
+{
        if (cur_p->loc != JAIL) {
                printf("But you're not IN Jail\n");
                return;
@@ -83,16 +90,19 @@ pay() {
        cur_p->in_jail = 0;
        printf("That cost you $50\n");
 }
+
 /*
  *     This routine deals with a move in jail
  */
+int
 move_jail(r1, r2)
-reg int        r1, r2; {
-
+       int r1, r2;
+{
        if (r1 != r2) {
                printf("Sorry, that doesn't get you out\n");
                if (++(cur_p->in_jail) == 3) {
-                       printf("It's your third turn and you didn't roll doubles.  You have to pay $50\n");
+                       printf("It's your third turn and you didn't roll "
+                           "doubles.  You have to pay $50\n");
                        cur_p->money -= 50;
 moveit:
                        cur_p->loc = 10;
@@ -108,8 +118,10 @@ moveit:
                goto moveit;
        }
 }
-printturn() {
 
+void
+printturn()
+{
        if (cur_p->loc != JAIL)
                return;
        printf("(This is your ");