Pull SERGEEV dependencies out of reports.c.

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

diff --git a/reports.c b/reports.c
index 6486d9db73f666ded87be3720ae781e2549912ec..cf5da97de435434397d02a4f7112bff4d6393eb0 100644 (file)
--- a/reports.c
+++ b/reports.c
@@ -2,12 +2,8 @@
 #include <math.h>
 #include <stdlib.h>
 #include <string.h>
-#ifdef SERGEEV
-#include <conio.h>
+#include "conio.h"
 #include "sstlinux.h"
-#else
-#define c_printf proutn
-#endif /* SERGEEV */
 
 void attakreport(int l) {
      if (!l) {
@@ -29,9 +25,7 @@ void attakreport(int l) {
         if (isatb == 1)
            proutn("Base in %i - %i attacked by S. Alive until %.1f", game.state.isx, game.state.isy, game.future[FSCDBAS]);
      }
-#ifdef SERGEEV
      clreol();
-#endif /* SERGEEV */
 }
        
 
@@ -203,9 +197,7 @@ void chart(int nn) {
                                 strcpy(buf, "...");
                        else if (game.starch[i][j] > 999)
                                 if ((i==quadx)&&(j==quady)){
-#ifdef SERGEEV
                                    gotoxy(wherex()-1,wherey());
-#endif /* SERGEEV */
                                    if (game.starch[i][i]<2000)
                                       sprintf(buf, "%03d", game.starch[i][j]-1000);
                                    else 
@@ -217,9 +209,7 @@ void chart(int nn) {
                                     else 
                                        strcpy(buf, "***");
                         else if ((i==quadx)&&(j==quady)){
-#ifdef SERGEEV
                                 gotoxy(wherex()-1,wherey());
-#endif /* SERGEEV */
                                 sprintf(buf, "%03d", game.state.galaxy[i][j]);
                         }
                         else if (game.state.galaxy[i][j]>=1000)
@@ -234,11 +224,7 @@ void chart(int nn) {
                 c_printf("  |");
                 if (i<8) c_printf("\n\r");
        }
-#ifdef SERGEEV
-       proutn("");     /* flush output */
-#else
-       skip(2);
-#endif
+       prout("");      /* flush output */
 }
                
                
@@ -281,7 +267,6 @@ int srscan(int l) {
                        for (j = 1; j <= 10; j++) {
                                 if (goodScan || (abs(i-sectx)<= 1 && abs(j-secty) <= 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)){
-#ifdef SERGEEV
                                         switch (condit) {
                                                 case IHRED: textcolor(RED); break;
                                                 case IHGREEN: textcolor(GREEN); break;
@@ -290,15 +275,10 @@ int srscan(int l) {
                                                 case IHDEAD: textcolor(WHITE);
                                         }
                                         if (game.quad[i][j]!=ship) highvideo();
-#endif /* SERGEEV */
                                    }
-#ifdef SERGEEV
                                    if (game.quad[i][j] & 128) highvideo();
-#endif /* SERGEEV */
                                    c_printf("%c ",game.quad[i][j] & 127);
-#ifdef SERGEEV
                                    textcolor(LIGHTGRAY);
-#endif /* SERGEEV */
                                 }
                                else
                                        proutn("- ");
@@ -369,11 +349,7 @@ int srscan(int l) {
                if (k!=0) return(goodScan);
        }
        if (nn) chart(1);
-#ifdef SERGEEV
-       proutn("");
-#else
-       skip(2);
-#endif /* SERGEEV */
+       prout("");
         return(goodScan);
 }