Chase more booleans and enums.

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

diff --git a/src/ai.c b/src/ai.c
index 1fd1b9ba6971326cfa4d148bc3db1e8ba0475a43..b4b35b9ed93f8be79999b3d72b0d786d7232972b 100644 (file)
--- a/src/ai.c
+++ b/src/ai.c
@@ -27,8 +27,8 @@ static bool tryexit(coord look, int ienm, int loccom, bool irun)
     /* print escape message and move out of quadrant.
        We know this if either short or long range sensors are working */
     if (!damaged(DSRSENS) || !damaged(DLRSENS) ||
-       game.condit == IHDOCKED) {
-       crmena(1, ienm, sector, game.ks[loccom]);
+       game.condition == docked) {
+       crmena(true, ienm, sector, game.ks[loccom]);
        prout(_(" escapes to %s (and regains strength)."),
              cramlc(quadrant, iq));
     }
@@ -40,13 +40,13 @@ static bool tryexit(coord look, int ienm, int loccom, bool irun)
     game.kdist[loccom] = game.kdist[game.nenhere];
     game.klhere--;
     game.nenhere--;
-    if (game.condit != IHDOCKED) newcnd();
+    if (game.condition != docked) newcnd();
     /* Handle global matters related to escape */
     game.state.galaxy[game.quadrant.x][game.quadrant.y].klingons--;
     game.state.galaxy[iq.x][iq.y].klingons++;
     if (ienm==IHS) {
        game.ishere = false;
-       game.iscate = 0;
+       game.iscate = false;
        game.ientesc = false;
        game.isatb = 0;
        schedule(FSCMOVE, 0.2777);
@@ -66,7 +66,7 @@ static bool tryexit(coord look, int ienm, int loccom, bool irun)
 }
 
 
-static void movebaddy(coord com, int loccom, int ienm)
+static void movebaddy(coord com, int loccom, feature ienm)
 /* tactical movement for the bad guys */
 {
     int motion, mdist, nsteps, mx, my, ll;
@@ -85,7 +85,7 @@ static void movebaddy(coord com, int loccom, int ienm)
 
     /* If SC, check with spy to see if should hi-tail it */
     if (ienm==IHS &&
-       (game.kpower[loccom] <= 500.0 || (game.condit==IHDOCKED && !damaged(DPHOTON)))) {
+       (game.kpower[loccom] <= 500.0 || (game.condition==docked && !damaged(DPHOTON)))) {
        irun = true;
        motion = -QUADSIZE;
     }
@@ -146,12 +146,12 @@ static void movebaddy(coord com, int loccom, int ienm)
            forces += 1000.0;
        }
        motion = 0;
-       if (forces <= 1000.0 && game.condit != IHDOCKED) /* Typical situation */
+       if (forces <= 1000.0 && game.condition != docked) /* Typical situation */
            motion = ((forces+200.0*Rand())/150.0) - 5.0;
        else {
            if (forces > 1000.0) /* Very strong -- move in for kill */
                motion = (1.0-square(Rand()))*dist1 + 1.0;
-           if (game.condit==IHDOCKED && (game.options & OPTION_BASE)) /* protected by base -- back off ! */
+           if (game.condition==docked && (game.options & OPTION_BASE)) /* protected by base -- back off ! */
                motion -= game.skill*(2.0-square(Rand()));
        }
        if (idebug)
@@ -239,7 +239,7 @@ static void movebaddy(coord com, int loccom, int ienm)
        /* it moved */
        game.ks[loccom] = next;
        game.kdist[loccom] = game.kavgd[loccom] = distance(game.sector, next);
-       if (!damaged(DSRSENS) || game.condit == IHDOCKED) {
+       if (!damaged(DSRSENS) || game.condition == docked) {
            proutn("***");
            cramen(ienm);
            proutn(_(" from %s"), cramlc(2, com));
@@ -310,7 +310,7 @@ static bool movescom(coord iq, bool flag, bool *ipage)
     game.state.galaxy[game.state.kscmdr.x][game.state.kscmdr.y].klingons++;
     if (game.ishere) {
        /* SC has scooted, Remove him from current quadrant */
-       game.iscate=0;
+       game.iscate=false;
        game.isatb=0;
        game.ishere = false;
        game.ientesc = false;
@@ -324,7 +324,7 @@ static bool movescom(coord iq, bool flag, bool *ipage)
        game.kpower[i] = game.kpower[game.nenhere];
        game.klhere--;
        game.nenhere--;
-       if (game.condit!=IHDOCKED) newcnd();
+       if (game.condition!=docked) newcnd();
        sortkl();
     }
     /* check for a helpful planet */
@@ -334,9 +334,9 @@ static bool movescom(coord iq, bool flag, bool *ipage)
            /* destroy the planet */
            DESTROY(&game.state.plnets[i]);
            game.state.galaxy[game.state.kscmdr.x][game.state.kscmdr.y].planet = NOPLANET;
-           if (!damaged(DRADIO) || game.condit == IHDOCKED) {
-               if (*ipage==0) pause_game(1);
-               *ipage = 1;
+           if (!damaged(DRADIO) || game.condition == docked) {
+               if (!*ipage) pause_game(true);
+               *ipage = true;
                prout(_("Lt. Uhura-  \"Captain, Starfleet Intelligence reports"));
                proutn(_("   a planet in "));
                proutn(cramlc(quadrant, game.state.kscmdr));
@@ -363,7 +363,7 @@ void scom(bool *ipage)
     /* Decide on being active or passive */
     flag = ((NKILLC+NKILLK)/(game.state.date+0.01-game.indate) < 0.1*game.skill*(game.skill+1.0) ||
            (game.state.date-game.indate) < 3.0);
-    if (game.iscate==0 && flag) {
+    if (!game.iscate && flag) {
        /* compute move away from Enterprise */
        ideltax = game.state.kscmdr.x-game.quadrant.x;
        ideltay = game.state.kscmdr.y-game.quadrant.y;
@@ -387,9 +387,9 @@ void scom(bool *ipage)
        }
        if (game.state.rembase > 1) {
            /* sort into nearest first order */
-           int iswitch;
+           bool iswitch;
            do {
-               iswitch = 0;
+               iswitch = false;
                for (i=1; i < game.state.rembase-1; i++) {
                    if (bdist[i] > bdist[i+1]) {
                        int ti = basetbl[i];
@@ -398,7 +398,7 @@ void scom(bool *ipage)
                        bdist[i+1] = t;
                        basetbl[i] = basetbl[i+1];
                        basetbl[i+1] =ti;
-                       iswitch = 1;
+                       iswitch = true;
                    }
                }
            } while (iswitch);
@@ -417,7 +417,7 @@ void scom(bool *ipage)
            /* if there is a commander, an no other base is appropriate,
               we will take the one with the commander */
            for_commanders (j) {
-               if (ibq.x==game.state.kcmdr[j].x && ibq.y==game.state.kcmdr[j].y && ifindit!= 2) {
+               if (same(ibq, game.state.kcmdr[j]) && ifindit!= 2) {
                    ifindit = 2;
                    iwhichb = i;
                    break;
@@ -487,11 +487,11 @@ void scom(bool *ipage)
            schedule(FSCDBAS, 1.0 +2.0*Rand());
            if (is_scheduled(FCDBAS)) 
                postpone(FSCDBAS, scheduled(FCDBAS)-game.state.date);
-           if (damaged(DRADIO) && game.condit != IHDOCKED)
+           if (damaged(DRADIO) && game.condition != docked)
                return; /* no warning */
            game.iseenit = true;
-           if (*ipage == 0)  pause_game(1);
-           *ipage=1;
+           if (!*ipage)  pause_game(true);
+           *ipage = true;
            proutn(_("Lt. Uhura-  \"Captain, the starbase in "));
            proutn(cramlc(quadrant, game.state.kscmdr));
            skip(1);
@@ -510,11 +510,11 @@ void scom(bool *ipage)
     if (
        !idebug &&
        (Rand() > 0.2 ||
-        (damaged(DRADIO) && game.condit != IHDOCKED) ||
+        (damaged(DRADIO) && game.condition != docked) ||
         !game.state.galaxy[game.state.kscmdr.x][game.state.kscmdr.y].charted))
        return;
-    if (*ipage==0) pause_game(1);
-    *ipage = 1;
+    if (!*ipage) pause_game(true);
+    *ipage = true;
     prout(_("Lt. Uhura-  \"Captain, Starfleet Intelligence reports"));
     proutn(_("   the Super-commander is in "));
     proutn(cramlc(quadrant, game.state.kscmdr));