Replace more #defines with enums.

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

diff --git a/src/reports.c b/src/reports.c
index 57297f567e0e3c7f812da96cd6de2076320ae956..90b9faf8fc36b6f8753de7d4728bb8a8c6cfade2 100644 (file)
--- a/src/reports.c
+++ b/src/reports.c
@@ -71,11 +71,11 @@ void report(void)
        prout(_(" destroyed, %d remaining."), game.state.rembase);
     }
     else prout(_("There are %d bases."), game.inbase);
        prout(_(" destroyed, %d remaining."), game.state.rembase);
     }
     else prout(_("There are %d bases."), game.inbase);

-    if (!damaged(DRADIO) || game.condit == IHDOCKED || game.iseenit) {
+    if (!damaged(DRADIO) || game.condition == docked || game.iseenit) {

        /* Don't report this if not seen and
           either the radio is dead or not at base! */
        attakreport(false);
        /* Don't report this if not seen and
           either the radio is dead or not at base! */
        attakreport(false);

-       game.iseenit = 1;
+       game.iseenit = true;

     }
     if (game.casual) prout(_("%d casualt%s suffered so far."),
                      game.casual, game.casual==1? "y" : "ies");
     }
     if (game.casual) prout(_("%d casualt%s suffered so far."),
                      game.casual, game.casual==1? "y" : "ies");


@@ -89,7 +89,7 @@ void report(void)
        if (game.nprobes!=1) proutn(_("s"));
        prout(".");
     }
        if (game.nprobes!=1) proutn(_("s"));
        prout(".");
     }

-    if ((!damaged(DRADIO) || game.condit == IHDOCKED)
+    if ((!damaged(DRADIO) || game.condition == docked)

                && is_scheduled(FDSPROB)) {
        if (game.isarmed) 
            proutn(_("An armed deep space probe is in"));
                && is_scheduled(FDSPROB)) {
        if (game.isarmed) 
            proutn(_("An armed deep space probe is in"));


@@ -122,7 +122,7 @@ void lrscan(void)
     chew();
     if (damaged(DLRSENS)) {
        /* Now allow base's sensors if docked */
     chew();
     if (damaged(DLRSENS)) {
        /* Now allow base's sensors if docked */

-       if (game.condit != IHDOCKED) {
+       if (game.condition != docked) {

            prout(_("LONG-RANGE SENSORS DAMAGED."));
            return;
        }
            prout(_("LONG-RANGE SENSORS DAMAGED."));
            return;
        }


@@ -198,7 +198,7 @@ void chart(bool title)
     if (!damaged(DRADIO))
        rechart();
 
     if (!damaged(DRADIO))
        rechart();
 

-    if (game.lastchart < game.state.date && game.condit == IHDOCKED) {
+    if (game.lastchart < game.state.date && game.condition == docked) {

        prout(_("Spock-  \"I revised the Star Chart from the starbase's records.\""));
        rechart();
     }
        prout(_("Spock-  \"I revised the Star Chart from the starbase's records.\""));
        rechart();
     }


@@ -241,12 +241,12 @@ static void sectscan(int goodScan, int i, int j)
 {
     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)){
 {
     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)){

-           switch (game.condit) {
-           case IHRED: textcolor(RED); break;
-           case IHGREEN: textcolor(GREEN); break;
-           case IHYELLOW: textcolor(YELLOW); break;
-           case IHDOCKED: textcolor(CYAN); break;
-           case IHDEAD: textcolor(BROWN);
+           switch (game.condition) {
+           case red: textcolor(RED); break;
+           case green: textcolor(GREEN); break;
+           case yellow: textcolor(YELLOW); break;
+           case docked: textcolor(CYAN); break;
+           case dead: textcolor(BROWN);

            }
            if (game.quad[i][j] != game.ship) 
                highvideo();
            }
            if (game.quad[i][j] != game.ship) 
                highvideo();


@@ -268,13 +268,13 @@ static void status(int req)
        proutn(_("Stardate      %.1f, Time Left %.2f"), game.state.date, game.state.remtime);
        break;
     case 2:
        proutn(_("Stardate      %.1f, Time Left %.2f"), game.state.date, game.state.remtime);
        break;
     case 2:

-       if (game.condit != IHDOCKED) newcnd();
-       switch (game.condit) {
-       case IHRED: cp = "RED"; break;
-       case IHGREEN: cp = "GREEN"; break;
-       case IHYELLOW: cp = "YELLOW"; break;
-       case IHDOCKED: cp = "DOCKED"; break;
-       case IHDEAD: cp="DEAD"; break;
+       if (game.condition != docked) newcnd();
+       switch (game.condition) {
+       case red: cp = "RED"; break;
+       case green: cp = "GREEN"; break;
+       case yellow: cp = "YELLOW"; break;
+       case docked: cp = "DOCKED"; break;
+       case dead: cp="DEAD"; break;

        }
        for (t=0;t<NDEVICES;t++)
            if (game.damage[t]>0) 
        }
        for (t=0;t<NDEVICES;t++)
            if (game.damage[t]>0) 


@@ -288,7 +288,7 @@ static void status(int req)
     case 4:
        proutn(_("Life Support  "));
        if (damaged(DLIFSUP)) {
     case 4:
        proutn(_("Life Support  "));
        if (damaged(DLIFSUP)) {

-           if (game.condit == IHDOCKED)
+           if (game.condition == docked)

                proutn(_("DAMAGED, Base provides"));
            else
                proutn(_("DAMAGED, reserves=%4.2f"), game.lsupres);
                proutn(_("DAMAGED, Base provides"));
            else
                proutn(_("DAMAGED, reserves=%4.2f"), game.lsupres);


@@ -337,7 +337,7 @@ static void status(int req)
     }
 }
                
     }
 }
                

-int srscan(int l)
+void srscan(scantype type)

 /* short-range scan */
 {
     /* the "sy" request is undocumented */
 /* short-range scan */
 {
     /* the "sy" request is undocumented */


@@ -346,11 +346,11 @@ int srscan(int l)
     
     int i, j, jj, req=0;
     int goodScan=true, leftside=true, rightside=true, title=false; 
     
     int i, j, jj, req=0;
     int goodScan=true, leftside=true, rightside=true, title=false; 

-    switch (l) {
+    switch (type) {

     case SCAN_FULL: // SRSCAN
        if (damaged(DSRSENS)) {
            /* Allow base's sensors if docked */
     case SCAN_FULL: // SRSCAN
        if (damaged(DSRSENS)) {
            /* Allow base's sensors if docked */

-           if (game.condit != IHDOCKED) {
+           if (game.condition != docked) {

                prout(_("   S.R. SENSORS DAMAGED!"));
                goodScan=false;
            }
                prout(_("   S.R. SENSORS DAMAGED!"));
                goodScan=false;
            }


@@ -381,7 +381,7 @@ int srscan(int l)
            prout(_("UNRECOGNIZED REQUEST. Legal requests are:"));
            prout(_("  date, condition, position, lsupport, warpfactor,"));
            prout(_("  energy, torpedoes, shields, klingons, time, system, bases."));
            prout(_("UNRECOGNIZED REQUEST. Legal requests are:"));
            prout(_("  date, condition, position, lsupport, warpfactor,"));
            prout(_("  energy, torpedoes, shields, klingons, time, system, bases."));

-           return false;
+           return;

        }
        // no break
     case SCAN_STATUS: // STATUS
        }
        // no break
     case SCAN_STATUS: // STATUS


@@ -393,7 +393,7 @@ int srscan(int l)
        leftside=false;
        break;
     }
        leftside=false;
        break;
     }

-    if (game.condit != IHDOCKED) newcnd();
+    if (game.condition != docked) newcnd();

     for (i = 1; i <= max(QUADSIZE, sizeof(requests)/sizeof(requests[0])); i++) {
        jj = (req!=0 ? req : i);
        if (leftside && i <= QUADSIZE) {
     for (i = 1; i <= max(QUADSIZE, sizeof(requests)/sizeof(requests[0])); i++) {
        jj = (req!=0 ? req : i);
        if (leftside && i <= QUADSIZE) {


@@ -405,11 +405,10 @@ int srscan(int l)
        if (rightside)
            status(jj);
        if (i<sizeof(requests)/sizeof(requests[0])) skip(1);
        if (rightside)
            status(jj);
        if (i<sizeof(requests)/sizeof(requests[0])) skip(1);

-       if (req!=0) return(goodScan);
+       if (req!=0) return;

     }
     prout("");
     if (title) chart(true);
     }
     prout("");
     if (title) chart(true);

-    return(goodScan);

 }
                        
                        
 }