diff options
| author | Paul Janzen <pjanzen@cvs.openbsd.org> | 2001-09-03 21:36:13 +0000 |
|---|---|---|
| committer | Paul Janzen <pjanzen@cvs.openbsd.org> | 2001-09-03 21:36:13 +0000 |
| commit | f1cdbb298c5c6a07a3a8e004ac656c22c9d6b98e (patch) | |
| tree | 01ef2b7bdcc100abe9cae4fabbacb766e9c88d62 /games/mille/move.c | |
| parent | eae6d58c40fb460b3ba64a5372a3238ee22c2ad8 (diff) | |
Tidying, some from NetBSD.
Diffstat (limited to 'games/mille/move.c')
| -rw-r--r-- | games/mille/move.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/games/mille/move.c b/games/mille/move.c index a77d462e2c3..570505a0fa8 100644 --- a/games/mille/move.c +++ b/games/mille/move.c @@ -1,4 +1,4 @@ -/* $OpenBSD: move.c,v 1.8 2000/08/05 21:57:41 pjanzen Exp $ */ +/* $OpenBSD: move.c,v 1.9 2001/09/03 21:36:12 pjanzen Exp $ */ /* $NetBSD: move.c,v 1.4 1995/03/24 05:01:57 cgd Exp $ */ /* @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)move.c 8.1 (Berkeley) 5/31/93"; #else -static char rcsid[] = "$OpenBSD: move.c,v 1.8 2000/08/05 21:57:41 pjanzen Exp $"; +static char rcsid[] = "$OpenBSD: move.c,v 1.9 2001/09/03 21:36:12 pjanzen Exp $"; #endif #endif /* not lint */ @@ -79,7 +79,7 @@ domove() else error("no card there"); } else { - if (issafety(pp->hand[Card_no])) { + if (is_safety(pp->hand[Card_no])) { error("discard a safety?"); goodplay = FALSE; break; @@ -112,7 +112,7 @@ domove() acc: if (Play == COMP) { account(*Topcard); - if (issafety(*Topcard)) + if (is_safety(*Topcard)) pp->safety[*Topcard-S_CONV] = S_IN_HAND; } if (pp->hand[1] == C_INIT && Topcard > Deck) { @@ -171,11 +171,11 @@ check_go() op = (pp == &Player[COMP] ? &Player[PLAYER] : &Player[COMP]); for (i = 0; i < HAND_SZ; i++) { card = pp->hand[i]; - if (issafety(card) || canplay(pp, op, card)) { + if (is_safety(card) || canplay(pp, op, card)) { #ifdef DEBUG if (Debug) { fprintf(outf, "CHECK_GO: can play %s (%d), ", C_name[card], card); - fprintf(outf, "issafety(card) = %d, ", issafety(card)); + fprintf(outf, "is_safety(card) = %d, ", is_safety(card)); fprintf(outf, "canplay(pp, op, card) = %d\n", canplay(pp, op, card)); } #endif @@ -248,7 +248,7 @@ mustpick: case C_GO: if (pp->battle != C_INIT && pp->battle != C_STOP - && !isrepair(pp->battle)) + && !is_repair(pp->battle)) return error("cannot play \"Go\" on a \"%s\"", C_name[pp->battle]); if (pp->safety[S_RIGHT_WAY] == S_PLAYED) @@ -318,7 +318,7 @@ protected: if (pp->speed == C_LIMIT) pp->speed = C_INIT; if (pp->battle == C_STOP || pp->battle == C_INIT || - (!pp->can_go && isrepair(pp->battle))) { + (!pp->can_go && is_repair(pp->battle))) { pp->can_go = TRUE; pp->battle = C_GO; } |