More boolean-chasing and coord applications.

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

diff --git a/src/reports.c b/src/reports.c
index 7f4a13e72bad3bf955f2d031722e9abbab3d3457..ac41cd81fbcdb57634b19b648f7490e9cf5bd2f2 100644 (file)
--- a/src/reports.c
+++ b/src/reports.c
@@ -3,7 +3,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-void attakreport(int curt) 
+void attakreport(bool curt)
+/* report status of bases under attack */
 {
     if (!curt) {
        if (is_scheduled(FCDBAS)) {
@@ -28,7 +29,8 @@ void attakreport(int curt)
 }
        
 
-void report(void) 
+void report(void)
+/* report on general game status */
 {
     char *s1,*s2,*s3;
 
@@ -72,8 +74,8 @@ void report(void)
     if (!damaged(DRADIO) || game.condit == IHDOCKED || game.iseenit) {
        /* Don't report this if not seen and
           either the radio is dead or not at base! */
-       attakreport(0);
-       game.iseenit = 1;
+       attakreport(false);
+       game.iseenit = true;
     }
     if (game.casual) prout(_("%d casualt%s suffered so far."),
                      game.casual, game.casual==1? "y" : "ies");
@@ -114,6 +116,7 @@ void report(void)
 }
        
 void lrscan(void) 
+/* long-range sensor scan */
 {
     int x, y;
     chew();
@@ -150,6 +153,7 @@ void lrscan(void)
 }
 
 void dreprt(void) 
+/* damage report */
 {
     bool jdam = false;
     int i;
@@ -185,7 +189,8 @@ void rechart(void)
            }
 }
 
-void chart(int nn) 
+void chart(bool title)
+/* display the star chart */ 
 {
     int i,j;
     chew();
@@ -198,7 +203,7 @@ void chart(int nn)
        rechart();
     }
 
-    if (nn == 0) prout(_("       STAR CHART FOR THE KNOWN GALAXY"));
+    if (!title) prout(_("       STAR CHART FOR THE KNOWN GALAXY"));
     if (game.state.date > game.lastchart)
        prout(_("(Last surveillance update %d stardates ago)."),
              (int)(game.state.date-game.lastchart));
@@ -232,6 +237,7 @@ void chart(int nn)
 }
 
 static void sectscan(int goodScan, int i, int j) 
+/* light up an individual dot in a sector */
 {
     if (goodScan || (abs(i-game.sector.x)<= 1 && abs(j-game.sector.y) <= 1)){
        if ((game.quad[i][j]==IHMATER0)||(game.quad[i][j]==IHMATER1)||(game.quad[i][j]==IHMATER2)||(game.quad[i][j]==IHE)||(game.quad[i][j]==IHF)){
@@ -252,7 +258,8 @@ static void sectscan(int goodScan, int i, int j)
        proutn("- ");
 }
 
-static void status(int req) 
+static void status(int req)
+/* print status report lines */
 {
     char *cp = NULL;
     int t, dam = 0;
@@ -316,28 +323,29 @@ static void status(int req)
        break;
     case 10:
        if (game.options & OPTION_WORLDS) {
-           int here = game.state.galaxy[game.quadrant.x][game.quadrant.y].planet;
-           if (here != NOPLANET && game.state.plnets[here].inhabited != UNINHABITED)
-               proutn(_("Major system  %s"), systemname(here));
+           int plnet = game.state.galaxy[game.quadrant.x][game.quadrant.y].planet;
+           if (plnet != NOPLANET && game.state.plnets[plnet].inhabited != UNINHABITED)
+               proutn(_("Major system  %s"), systemname(plnet));
            else
                proutn(_("Sector is uninhabited"));
        }
 
        break;
     case 11:
-       attakreport(1);
+       attakreport(true);
        break;
     }
 }
                
-int srscan(int l) 
+int srscan(int l)
+/* short-range scan */
 {
     /* the "sy" request is undocumented */
     static char requests[][3] =
        {"","da","co","po","ls","wa","en","to","sh","kl","sy", "ti"};
     
     int i, j, jj, req=0;
-    int goodScan=true, leftside=true, rightside=true, nn=false; 
+    int goodScan=true, leftside=true, rightside=true, title=false; 
     switch (l) {
     case SCAN_FULL: // SRSCAN
        if (damaged(DSRSENS)) {
@@ -357,7 +365,7 @@ int srscan(int l)
            game.state.galaxy[game.quadrant.x][game.quadrant.y].charted = true;
        }
        scan();
-       if (isit("chart")) nn = true;
+       if (isit("chart")) title = true;
        if (isit("no")) rightside = false;
        chew();
        prout("    1 2 3 4 5 6 7 8 9 10");
@@ -400,14 +408,15 @@ int srscan(int l)
        if (req!=0) return(goodScan);
     }
     prout("");
-    if (nn) chart(1);
+    if (title) chart(true);
     return(goodScan);
 }
                        
                        
 void eta(void)
+/* use computer to get estimated time of arrival for a warp jump */
 {
-    int ix1, ix2, iy1, iy2;
+    coord w1, w2;
     bool wfl, prompt = false;
     double ttime, twarp, tpower;
     if (damaged(DCOMPTR)) {
@@ -424,33 +433,33 @@ void eta(void)
            return;
        }
     }
-    iy1 = aaitem +0.5;
+    w1.y = aaitem +0.5;
     if (scan() != IHREAL) {
        huh();
        return;
     }
-    ix1 = aaitem + 0.5;
+    w1.x = aaitem + 0.5;
     if (scan() == IHREAL) {
-       iy2 = aaitem + 0.5;
+       w2.y = aaitem + 0.5;
        if (scan() != IHREAL) {
            huh();
            return;
        }
-       ix2 = aaitem + 0.5;
+       w2.x = aaitem + 0.5;
     }
     else {
-       if (game.quadrant.y>ix1) ix2 = 1;
-       else ix2=QUADSIZE;
-       if (game.quadrant.x>iy1) iy2 = 1;
-       else iy2=QUADSIZE;
+       if (game.quadrant.y>w1.x) w2.x = 1;
+       else w2.x=QUADSIZE;
+       if (game.quadrant.x>w1.y) w2.y = 1;
+       else w2.y=QUADSIZE;
     }
 
-    if (!VALID_QUADRANT(ix1, iy1) || !VALID_SECTOR(ix2, iy2)) {
+    if (!VALID_QUADRANT(w1.x, w1.y) || !VALID_SECTOR(w2.x, w2.y)) {
        huh();
        return;
     }
-    game.dist = sqrt(square(iy1-game.quadrant.x+0.1*(iy2-game.sector.x))+
-               square(ix1-game.quadrant.y+0.1*(ix2-game.sector.y)));
+    game.dist = sqrt(square(w1.y-game.quadrant.y+0.1*(w2.y-game.sector.y))+
+               square(w1.x-game.quadrant.x+0.1*(w2.x-game.sector.x)));
     wfl = false;
 
     if (prompt) prout(_("Answer \"no\" if you don't know the value:"));
@@ -528,9 +537,9 @@ void eta(void)
            prout(_("Unfortunately, the Federation will be destroyed by then."));
        if (twarp > 6.0)
            prout(_("You'll be taking risks at that speed, Captain"));
-       if ((game.isatb==1 && game.state.kscmdr.y == iy1 && game.state.kscmdr.x == ix1 &&
+       if ((game.isatb==1 && same(game.state.kscmdr, w1) &&
             scheduled(FSCDBAS)< ttime+game.state.date)||
-           (scheduled(FCDBAS)<ttime+game.state.date && game.battle.y==iy1 && game.battle.x == ix1))
+           (scheduled(FCDBAS)<ttime+game.state.date && same(game.battle, w1)))
            prout(_("The starbase there will be destroyed by then."));
        proutn(_("New warp factor to try? "));
        if (scan() == IHREAL) {