- remove duplicate comment

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

diff --git a/monop/jail.c b/monop/jail.c
index 8c03e9bff34424bd465d56b1eadefead23895c05..62b9ea0b3203e66bec8357a1c2661d288c049cab 100644 (file)
--- a/monop/jail.c
+++ b/monop/jail.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: jail.c,v 1.4 1997/10/12 17:45:14 christos Exp $        */
+/*     $NetBSD: jail.c,v 1.10 2012/06/19 05:35:32 dholland 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,20 +34,19 @@
 #if 0
 static char sccsid[] = "@(#)jail.c     8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: jail.c,v 1.4 1997/10/12 17:45:14 christos Exp $");
+__RCSID("$NetBSD: jail.c,v 1.10 2012/06/19 05:35:32 dholland Exp $");
 #endif
 #endif /* not lint */
 
-#include "monop.ext"
+#include "monop.h"
 
 /*
  *     This routine uses a get-out-of-jail-free card to get the
  * player out of jail.
  */
 void
-card()
+card(void)
 {
-
        if (cur_p->loc != JAIL) {
                printf("But you're not IN Jail\n");
                return;
@@ -64,28 +59,13 @@ 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)
-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.
  */
 void
-pay()
+pay(void)
 {
-
        if (cur_p->loc != JAIL) {
                printf("But you're not IN Jail\n");
                return;
@@ -95,18 +75,18 @@ 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)
-int    r1, r2;
+move_jail(int r1, int 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;
@@ -116,17 +96,15 @@ moveit:
                        return TRUE;
                }
                return FALSE;
-       }
-       else {
+       } else {
                printf("Double roll gets you out.\n");
                goto moveit;
        }
 }
 
 void
-printturn()
+printturn(void)
 {
-
        if (cur_p->loc != JAIL)
                return;
        printf("(This is your ");