Use __dead and __printflike instead of __attribute__.

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

diff --git a/monop/jail.c b/monop/jail.c
index f6ad097973e3b1726d7a6f2a8eb5a825f7e6e4fb..917b7a0a82e88814dbc88f7f38492e41da4d31fe 100644 (file)
--- a/monop/jail.c
+++ b/monop/jail.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: jail.c,v 1.6 2003/08/07 09:37:28 agc Exp $     */
+/*     $NetBSD: jail.c,v 1.9 2008/02/24 01:57:34 dholland Exp $        */

 
 /*
  * Copyright (c) 1980, 1993
 
 /*
  * Copyright (c) 1980, 1993


@@ -34,11 +34,11 @@
 #if 0
 static char sccsid[] = "@(#)jail.c     8.1 (Berkeley) 5/31/93";
 #else
 #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 $");
+__RCSID("$NetBSD: jail.c,v 1.9 2008/02/24 01:57:34 dholland Exp $");

 #endif
 #endif /* not lint */
 
 #endif
 #endif /* not lint */
 

-#include "monop.ext"
+#include "monop.h"

 
 /*
  *     This routine uses a get-out-of-jail-free card to get the
 
 /*
  *     This routine uses a get-out-of-jail-free card to get the


@@ -60,21 +60,6 @@ card()
        cur_p->in_jail = 0;
 }
 
        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.
  */
 /*
  *     This routine deals with paying your way out of jail.
  */


@@ -112,8 +97,7 @@ moveit:
                        return TRUE;
                }
                return FALSE;
                        return TRUE;
                }
                return FALSE;

-       }
-       else {
+       } else {

                printf("Double roll gets you out.\n");
                goto moveit;
        }
                printf("Double roll gets you out.\n");
                goto moveit;
        }