Don't declare 'extern opt*' getopt variables.

[bsdgames-darwin.git] / mille / comp.c

diff --git a/mille/comp.c b/mille/comp.c
index 6ca5ad76d9ad00c618a4df5a6a4c17aac1df72d1..b184e6bb608f028f29670210f8a3ae162079be51 100644 (file)
--- a/mille/comp.c
+++ b/mille/comp.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: comp.c,v 1.5 1997/10/12 00:53:45 lukem Exp $   */
+/*     $NetBSD: comp.c,v 1.8 1999/09/30 18:01:32 jsm Exp $     */
 
 /*
  * Copyright (c) 1982, 1993
@@ -38,7 +38,7 @@
 #if 0
 static char sccsid[] = "@(#)comp.c     8.1 (Berkeley) 5/31/93";
 #else
-__RCSID("$NetBSD: comp.c,v 1.5 1997/10/12 00:53:45 lukem Exp $");
+__RCSID("$NetBSD: comp.c,v 1.8 1999/09/30 18:01:32 jsm Exp $");
 #endif
 #endif /* not lint */
 
@@ -131,7 +131,7 @@ norm:
        if (foundend)
                foundend = !check_ext(TRUE);
        for (i = 0; safe && i < HAND_SZ; i++) {
-               if (issafety(pp->hand[i])) {
+               if (is_safety(pp->hand[i])) {
                        if (onecard(op) || (foundend && cango && !canstop)) {
 #ifdef DEBUG
                                if (Debug)
@@ -167,7 +167,7 @@ playsafe:
                        playit[i] = cango;
                }
        }
-       if (!pp->can_go && !isrepair(pp->battle))
+       if (!pp->can_go && !is_repair(pp->battle))
                Numneed[opposite(pp->battle)]++;
 redoit:
        foundlow = (cango || count[C_END_LIMIT] != 0
@@ -183,7 +183,7 @@ redoit:
        value = valbuf;
        for (i = 0; i < HAND_SZ; i++) {
                card = pp->hand[i];
-               if (issafety(card) || playit[i] == (cango != 0)) {
+               if (is_safety(card) || playit[i] == (cango != 0)) {
 #ifdef DEBUG
                        if (Debug)
                                fprintf(outf, "CALCMOVE: switch(\"%s\")\n",
@@ -194,7 +194,7 @@ redoit:
                                diff = End - pp->mileage;
                                /* avoid getting too close */
                                if (Topcard > Deck && cango && diff <= 100
-                                   && diff / Value[card] > count[card]
+                                   && (int)diff / Value[card] > count[card]
                                    && (card == C_25 || diff % 50 == 0)) {
                                        if (card == C_50 && diff - 50 == 25
                                            && count[C_25] > 0)
@@ -383,7 +383,7 @@ normbad:
 #endif
                value++;
        }
-       if (!pp->can_go && !isrepair(pp->battle))
+       if (!pp->can_go && !is_repair(pp->battle))
                Numneed[opposite(pp->battle)]++;
        if (cango) {
 play_it:
@@ -392,7 +392,7 @@ play_it:
                Card_no = nummax;
        }
        else {
-               if (issafety(pp->hand[nummin])) { /* NEVER discard a safety */
+               if (is_safety(pp->hand[nummin])) { /* NEVER discard a safety */
                        nummax = nummin;
                        goto play_it;
                }
@@ -408,14 +408,14 @@ play_it:
  */
 int
 onecard(pp)
-       PLAY    *pp;
+       const PLAY      *pp;
 {
        CARD    bat, spd, card;
 
        bat = pp->battle;
        spd = pp->speed;
        card = -1;
-       if (pp->can_go || ((isrepair(bat) || bat == C_STOP || spd == C_LIMIT) &&
+       if (pp->can_go || ((is_repair(bat) || bat == C_STOP || spd == C_LIMIT) &&
                           Numseen[S_RIGHT_WAY] != 0) ||
            (bat >= 0 && Numseen[safety(bat)] != 0))
                switch (End - pp->mileage) {
@@ -441,7 +441,7 @@ onecard(pp)
 
 int
 canplay(pp, op, card)
-       PLAY    *pp, *op;
+       const PLAY      *pp, *op;
        CARD    card;
 {
        switch (card) {
@@ -478,7 +478,7 @@ canplay(pp, op, card)
                break;
          case C_GO:
                if (!pp->can_go &&
-                   (isrepair(pp->battle) || pp->battle == C_STOP))
+                   (is_repair(pp->battle) || pp->battle == C_STOP))
                        return TRUE;
                break;
          case C_END_LIMIT: