X-Git-Url: https://jxself.org/git/?p=super-star-trek.git;a=blobdiff_plain;f=src%2Fai.c;h=889aafe210d8e7556b1def774ccbfc567ece1a1e;hp=734a5b5334bb7739defc394a63edb4726ce20962;hb=3fad5b50fc2950c556a55e39a78e7129353af0b1;hpb=3590a3f873652e8e718ebe3898c913cdf6b36d1c diff --git a/src/ai.c b/src/ai.c index 734a5b5..889aafe 100644 --- a/src/ai.c +++ b/src/ai.c @@ -26,9 +26,9 @@ static bool tryexit(int lookx, int looky, int ienm, int loccom, int irun) } /* print escape message and move out of quadrant. We know this if either short or long range sensors are working */ - if (game.damage[DSRSENS] == 0.0 || game.damage[DLRSENS] == 0.0 || + 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) { @@ -87,7 +86,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 && game.damage[DPHOTON]==0))) { + (game.kpower[loccom] <= 500.0 || (game.condit==IHDOCKED && !damaged(DPHOTON)))) { irun = 1; motion = -QUADSIZE; } @@ -133,12 +132,12 @@ static void movebaddy(coord com, int loccom, int ienm) forces = game.kpower[loccom]+100.0*game.nenhere+400*(nbaddys-1); if (!game.shldup) forces += 1000; /* Good for enemy if shield is down! */ - if (game.damage[DPHASER] == 0.0 || game.damage[DPHOTON] == 0.0) { - if (game.damage[DPHASER] != 0) /* phasers damaged */ + if (!damaged(DPHASER) || !damaged(DPHOTON)) { + if (damaged(DPHASER)) /* phasers damaged */ forces += 300.0; else forces -= 0.2*(game.energy - 2500.0); - if (game.damage[DPHOTON] != 0) /* photon torpedoes damaged */ + if (damaged(DPHOTON)) /* photon torpedoes damaged */ forces += 300.0; else forces -= 50.0*game.torps; @@ -209,7 +208,7 @@ static void movebaddy(coord com, int loccom, int ienm) /* See if we should ram ship */ if (game.quad[lookx][looky] == game.ship && (ienm == IHC || ienm == IHS)) { - ram(1, ienm, com); + ram(true, ienm, com); return; } if (krawlx != mx && my != 0) { @@ -242,9 +241,8 @@ 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)); - if (game.damage[DSRSENS] == 0 || game.condit == IHDOCKED) { + game.kdist[loccom] = game.kavgd[loccom] = distance(game.sector, next); + if (!damaged(DSRSENS) || game.condit == IHDOCKED) { proutn("***"); cramen(ienm); proutn(_(" from %s"), cramlc(2, com)); @@ -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; @@ -339,7 +337,7 @@ 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 (game.damage[DRADIO] == 0.0 || game.condit == IHDOCKED) { + if (!damaged(DRADIO) || game.condit == IHDOCKED) { if (*ipage==0) pause_game(1); *ipage = 1; prout(_("Lt. Uhura- \"Captain, Starfleet Intelligence reports")); @@ -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 */ @@ -494,7 +490,7 @@ void scom(bool *ipage) schedule(FSCDBAS, 1.0 +2.0*Rand()); if (is_scheduled(FCDBAS)) postpone(FSCDBAS, scheduled(FCDBAS)-game.state.date); - if (game.damage[DRADIO] > 0 && game.condit != IHDOCKED) + if (damaged(DRADIO) && game.condit != IHDOCKED) return; /* no warning */ game.iseenit = 1; if (*ipage == 0) pause_game(1); @@ -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; @@ -517,7 +513,7 @@ void scom(bool *ipage) if ( !idebug && (Rand() > 0.2 || - (game.damage[DRADIO] > 0.0 && game.condit != IHDOCKED) || + (damaged(DRADIO) && game.condit != IHDOCKED) || !game.state.galaxy[game.state.kscmdr.x][game.state.kscmdr.y].charted)) return; if (*ipage==0) pause_game(1); @@ -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; }