projects
/
super-star-trek.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Pull SERGEEV dependencies out of reports.c.
[super-star-trek.git]
/
reports.c
diff --git
a/reports.c
b/reports.c
index 852094f53429469d23d79fc580cb8cb9256213db..cf5da97de435434397d02a4f7112bff4d6393eb0 100644
(file)
--- a/
reports.c
+++ b/
reports.c
@@
-4,9
+4,6
@@
#include <string.h>
#include "conio.h"
#include "sstlinux.h"
#include <string.h>
#include "conio.h"
#include "sstlinux.h"
-#ifndef SERGEEV
-#define c_printf proutn
-#endif /* SERGEEV */
void attakreport(int l) {
if (!l) {
void attakreport(int l) {
if (!l) {
@@
-28,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]);
}
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();
clreol();
-#endif /* SERGEEV */
}
}
@@
-202,9
+197,7
@@
void chart(int nn) {
strcpy(buf, "...");
else if (game.starch[i][j] > 999)
if ((i==quadx)&&(j==quady)){
strcpy(buf, "...");
else if (game.starch[i][j] > 999)
if ((i==quadx)&&(j==quady)){
-#ifdef SERGEEV
gotoxy(wherex()-1,wherey());
gotoxy(wherex()-1,wherey());
-#endif /* SERGEEV */
if (game.starch[i][i]<2000)
sprintf(buf, "%03d", game.starch[i][j]-1000);
else
if (game.starch[i][i]<2000)
sprintf(buf, "%03d", game.starch[i][j]-1000);
else
@@
-216,9
+209,7
@@
void chart(int nn) {
else
strcpy(buf, "***");
else if ((i==quadx)&&(j==quady)){
else
strcpy(buf, "***");
else if ((i==quadx)&&(j==quady)){
-#ifdef SERGEEV
gotoxy(wherex()-1,wherey());
gotoxy(wherex()-1,wherey());
-#endif /* SERGEEV */
sprintf(buf, "%03d", game.state.galaxy[i][j]);
}
else if (game.state.galaxy[i][j]>=1000)
sprintf(buf, "%03d", game.state.galaxy[i][j]);
}
else if (game.state.galaxy[i][j]>=1000)
@@
-233,11
+224,7
@@
void chart(int nn) {
c_printf(" |");
if (i<8) c_printf("\n\r");
}
c_printf(" |");
if (i<8) c_printf("\n\r");
}
-#ifdef SERGEEV
- proutn(""); /* flush output */
-#else
- skip(2);
-#endif
+ prout(""); /* flush output */
}
}
@@
-287,13
+274,9
@@
int srscan(int l) {
case IHDOCKED: textcolor(LIGHTGRAY); break;
case IHDEAD: textcolor(WHITE);
}
case IHDOCKED: textcolor(LIGHTGRAY); break;
case IHDEAD: textcolor(WHITE);
}
-#ifdef SERGEEV
if (game.quad[i][j]!=ship) highvideo();
if (game.quad[i][j]!=ship) highvideo();
-#endif /* SERGEEV */
}
}
-#ifdef SERGEEV
if (game.quad[i][j] & 128) highvideo();
if (game.quad[i][j] & 128) highvideo();
-#endif /* SERGEEV */
c_printf("%c ",game.quad[i][j] & 127);
textcolor(LIGHTGRAY);
}
c_printf("%c ",game.quad[i][j] & 127);
textcolor(LIGHTGRAY);
}
@@
-366,11
+349,7
@@
int srscan(int l) {
if (k!=0) return(goodScan);
}
if (nn) chart(1);
if (k!=0) return(goodScan);
}
if (nn) chart(1);
-#ifdef SERGEEV
- proutn("");
-#else
- skip(2);
-#endif /* SERGEEV */
+ prout("");
return(goodScan);
}
return(goodScan);
}