Stas's fixes for torpedo and phaser animation.

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

diff --git a/reports.c b/reports.c
index ed1a14420e049d0e167a7657fa9650fde64ba186..b074cd8801e9e621ad6860fdb2a7b84a0c0b38bf 100644 (file)
--- a/reports.c
+++ b/reports.c
@@ -195,11 +195,11 @@ void chart(int nn)
        rechart();
 
     if (lastchart < game.state.date && condit == IHDOCKED) {
-       proutn("Spock-  \"I revised the Star Chart from the starbase's records.\"\n\r");
+       proutn("Spock-  \"I revised the Star Chart from the starbase's records.\"\n");
        rechart();
     }
 
-    if (nn == 0) proutn("       STAR CHART FOR THE KNOWN GALAXY\n\r");
+    if (nn == 0) proutn("       STAR CHART FOR THE KNOWN GALAXY\n");
     if (game.state.date > lastchart)
        prout("(Last surveillance update %d stardates ago).",
              (int)(game.state.date-lastchart));
@@ -208,7 +208,7 @@ void chart(int nn)
        proutn("%d |", i);
        for_quadrants(j) {
            char buf[4];
-           if ((game.options & OPTION_SHOWME) && i == quady && j == quadx)
+           if ((game.options & OPTION_SHOWME) && i == quadx && j == quady)
                proutn("<");
            else
                proutn(" ");
@@ -224,13 +224,13 @@ void chart(int nn)
                if (*cp == '0')
                    *cp = '.';
            proutn(buf);
-           if ((game.options & OPTION_SHOWME) && i == quady && j == quadx)
+           if ((game.options & OPTION_SHOWME) && i == quadx && j == quady)
                proutn(">");
            else
                proutn(" ");
        }
        proutn("  |");
-       if (i<GALSIZE) proutn("\n\r");
+       if (i<GALSIZE) proutn("\n");
     }
     prout(""); /* flush output */
 }
@@ -249,9 +249,7 @@ static void sectscan(int goodScan, int i, int j)
            if (game.quad[i][j] != ship) 
                highvideo();
        }
-       if (game.quad[i][j] & DAMAGED) 
-           highvideo();
-       proutn("%c ",game.quad[i][j] & ~DAMAGED);
+       proutn("%c ",game.quad[i][j]);
        textcolor(DEFAULT);
     }
     else
@@ -343,7 +341,7 @@ int srscan(int l)
            else
                prout("  [Using Base's sensors]");
        }
-       else proutn("     Short-range scan\n\r");
+       else proutn("     Short-range scan");
        if (goodScan && !game.damage[DRADIO]) { 
            game.state.chart[quadx][quady].klingons = game.state.galaxy[quadx][quady].klingons;
            game.state.chart[quadx][quady].starbase = game.state.galaxy[quadx][quady].starbase;
@@ -354,7 +352,7 @@ int srscan(int l)
        if (isit("chart")) nn = TRUE;
        if (isit("no")) rightside = FALSE;
        chew();
-       proutn("    1 2 3 4 5 6 7 8 9 10\n\r");
+       proutn("    1 2 3 4 5 6 7 8 9 10\n");
        break;
     case SCAN_REQUEST:
        while (scan() == IHEOL)
@@ -390,7 +388,7 @@ int srscan(int l)
        }
        if (rightside)
            status(jj);
-       if (i<sizeof(requests)/sizeof(requests[0])) proutn("\n\r");
+       if (i<sizeof(requests)/sizeof(requests[0])) proutn("\n");
        if (req!=0) return(goodScan);
     }
     prout("");