diff options
| author |   jsm <jsm@NetBSD.org> | 1999-09-30 18:01:31 +0000 |
|---|---|---|
| committer | jsm <jsm@NetBSD.org> | 1999-09-30 18:01:31 +0000 |
| commit | 963f40fabfbfc47378585a05f5b465cbd4e0c7b6 (patch) | |
| tree | 7d2ead721965b1afb7d25682629c2f61932820fc /mille/move.c | |
| parent | e2f2d09292b8ac5c5390ab1b7e6fa09ab554080f (diff) | |
| download | bsdgames-darwin-963f40fabfbfc47378585a05f5b465cbd4e0c7b6.tar.gz bsdgames-darwin-963f40fabfbfc47378585a05f5b465cbd4e0c7b6.tar.zst bsdgames-darwin-963f40fabfbfc47378585a05f5b465cbd4e0c7b6.zip | |
Fix uses of namespaces reserved by ISO C or POSIX.1.
Diffstat (limited to 'mille/move.c')
| -rw-r--r-- | mille/move.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/mille/move.c b/mille/move.c index afc3acb6..4afa8207 100644 --- a/mille/move.c +++ b/mille/move.c @@ -1,4 +1,4 @@ -/* $NetBSD: move.c,v 1.10 1999/09/08 21:17:51 jsm Exp $ */ +/* $NetBSD: move.c,v 1.11 1999/09/30 18:01:32 jsm Exp $ */ /* * Copyright (c) 1983, 1993 @@ -38,7 +38,7 @@ #if 0 static char sccsid[] = "@(#)move.c 8.1 (Berkeley) 5/31/93"; #else -__RCSID("$NetBSD: move.c,v 1.10 1999/09/08 21:17:51 jsm Exp $"); +__RCSID("$NetBSD: move.c,v 1.11 1999/09/30 18:01:32 jsm 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, ", issafety(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]); pp->battle = C_GO; @@ -290,7 +290,7 @@ protected: case C_DRIVE_SAFE: case C_RIGHT_WAY: if (pp->battle == opposite(card) || (card == C_RIGHT_WAY && pp->speed == C_LIMIT)) { - if (!(card == C_RIGHT_WAY && !isrepair(pp->battle))) { + if (!(card == C_RIGHT_WAY && !is_repair(pp->battle))) { pp->battle = C_GO; pp->can_go = TRUE; } @@ -323,7 +323,7 @@ protected: pp->can_go = TRUE; pp->battle = C_INIT; } - if (!pp->can_go && isrepair(pp->battle)) + if (!pp->can_go && is_repair(pp->battle)) pp->can_go = TRUE; } Next = -1; |