More boolean cleanups. More consistent use of coord type

[super-star-trek.git] / src / ai.c

diff --git a/src/ai.c b/src/ai.c
index 4b73b7488e190009efc01578eb494ee156b3db5f..e59657144774c73ba2ef8fdb48ee6c001d5e02b5 100644 (file)
--- a/src/ai.c
+++ b/src/ai.c
@@ -28,7 +28,7 @@ static bool tryexit(int lookx, int looky, int ienm, int loccom, int irun)
        We know this if either short or long range sensors are working */
     if (!damaged(DSRSENS) || !damaged(DLRSENS) ||
        game.condit == IHDOCKED) {
-       crmena(1, ienm, 2, game.ks[loccom]);
+       crmena(1, ienm, sector, game.ks[loccom]);
        prout(_(" escapes to %s (and regains strength)."),
              cramlc(quadrant, iq));
     }
@@ -45,14 +45,13 @@ static bool tryexit(int lookx, int looky, int ienm, int loccom, int irun)
     game.state.galaxy[game.quadrant.x][game.quadrant.y].klingons--;
     game.state.galaxy[iq.x][iq.y].klingons++;
     if (ienm==IHS) {
-       game.ishere=0;
-       game.iscate=0;
-       game.ientesc=0;
-       game.isatb=0;
+       game.ishere = false;
+       game.iscate = 0;
+       game.ientesc = false;
+       game.isatb = 0;
        schedule(FSCMOVE, 0.2777);
        unschedule(FSCDBAS);
-       game.state.kscmdr.x=iq.x;
-       game.state.kscmdr.y=iq.y;
+       game.state.kscmdr=iq;
     }
     else {
        for_commanders(n) {
@@ -242,8 +241,7 @@ static void movebaddy(coord com, int loccom, int ienm)
        /* it moved */
        game.ks[loccom].x = next.x;
        game.ks[loccom].y = next.y;
-       game.kdist[loccom] = game.kavgd[loccom] =
-           sqrt(square(game.sector.x-next.x)+square(game.sector.y-next.y));
+       game.kdist[loccom] = game.kavgd[loccom] = distance(game.sector, next);
        if (!damaged(DSRSENS) || game.condit == IHDOCKED) {
            proutn("***");
            cramen(ienm);
@@ -317,8 +315,8 @@ static bool movescom(coord iq, bool flag, bool *ipage)
        /* SC has scooted, Remove him from current quadrant */
        game.iscate=0;
        game.isatb=0;
-       game.ishere=0;
-       game.ientesc=0;
+       game.ishere = false;
+       game.ientesc = false;
        unschedule(FSCDBAS);
        for_local_enemies(i) 
            if (game.quad[game.ks[i].x][game.ks[i].y] == IHS) break;
@@ -388,9 +386,7 @@ void scom(bool *ipage)
        sc = game.state.kscmdr;
        for_starbases(i) {
            basetbl[i] = i;
-           ibq.x = game.state.baseq[i].x;
-           ibq.y = game.state.baseq[i].y;
-           bdist[i] = sqrt(square(ibq.x-sc.x) + square(ibq.y-sc.y));
+           bdist[i] = distance(game.state.baseq[i], sc);
        }
        if (game.state.rembase > 1) {
            /* sort into nearest first order */
@@ -507,7 +503,7 @@ void scom(bool *ipage)
                   (int)scheduled(FSCDBAS));
            if (!game.resting) return;
            prout(_("Mr. Spock-  \"Captain, shall we cancel the rest period?\""));
-           if (ja()==0) return;
+           if (ja() == false) return;
            game.resting = false;
            game.optime = 0.0; /* actually finished */
            return;
@@ -533,9 +529,8 @@ void movetho(void)
 /* move the Tholian */
 {
     int idx, idy, im, i;
-    coord dummy;
     /* Move the Tholian */
-    if (game.ithere==0 || game.justin == 1) return;
+    if (!game.ithere || game.justin) return;
 
     if (game.tholian.x == 1 && game.tholian.y == 1) {
        idx = 1; idy = QUADSIZE;
@@ -551,7 +546,7 @@ void movetho(void)
     }
     else {
        /* something is wrong! */
-       game.ithere = 0;
+       game.ithere = false;
        return;
     }
 
@@ -587,10 +582,11 @@ void movetho(void)
     }
     /* All plugged up -- Tholian splits */
     game.quad[game.tholian.x][game.tholian.y]=IHWEB;
-    dropin(IHBLANK, &dummy);
-    crmena(1,IHT, 2, game.tholian);
+    dropin(IHBLANK);
+    crmena(true, IHT, sector, game.tholian);
     prout(_(" completes web."));
-    game.ithere = game.tholian.x = game.tholian.y = 0;
+    game.ithere = false;
+    game.tholian.x = game.tholian.y = 0;
     game.nenhere--;
     return;
 }