Partial merge of I/O management.

diff --git a/io.c b/io.c
index f4ed854e99e215c1f677b559d54e6321ec6873da..3bc3b9c2c88d225069e90723e3ba96093f871dd8 100644 (file)
--- a/io.c
+++ b/io.c
@@ -101,10 +101,10 @@ void clearscreen(void) {
 }
 
 void pause_game(int i) {
+       char *prompt;
 #ifndef SERGEEV
-    char buf[BUFSIZ], *prompt;
+        char buf[BUFSIZ];
 #else /* SERGEEV */
-       char *prompt;
         drawmaps(0);
         setwnd(5);
 #endif /* SERGEEV */
@@ -287,6 +287,7 @@ void prouts(char *fmt, ...) {
 }
 
 void warble(void)
+/* sound and visual effects for teleportation */
 {
 #ifdef SERGEEV
     int posx, posy;

diff --git a/moving.c b/moving.c
index 4f2af10ad9dd8cba777d127e3c1ce495b4310464..537a82b3783224af029230765626621fbefee5d9 100644 (file)
--- a/moving.c
+++ b/moving.c
@@ -209,9 +209,7 @@ label100:
        }
        newcnd();
        iattak = 0;
-#ifdef SERGEEV
        drawmaps(0);
-#endif /* SERGEEV */
        return;
 }
 

diff --git a/planets.c b/planets.c
index 01e14b78f9c0bfae0a0815f38f63d61a5a1e814d..5ed87df431216c5bc03e90e79c361fd5115c15b2 100644 (file)
--- a/planets.c
+++ b/planets.c
@@ -82,10 +82,7 @@ void orbit(void) {
 }
 
 void sensor(void) {
-#ifdef SERGEEV
-    if (game.damage[DSRSENS] != 0.0) return;
-    if ((plnetx != 0)&&(game.state.plnets[iplnet].known == 0)) {
-#else
+#ifndef SERGEEV
        skip(1);
        chew();
        if (game.damage[DSRSENS] != 0.0) {
@@ -96,7 +93,9 @@ void sensor(void) {
                prout("No planet in this quadrant.");
                return;
        }
-#endif /* SERGEEV */
+#else
+    if (game.damage[DSRSENS] != 0.0) return;
+    if ((plnetx != 0)&&(game.state.plnets[iplnet].known == 0)) {
        prout("Spock-  \"Sensor scan for %s-", cramlc(quadrant, quadx, quady));
        skip(1);
        prout("         Planet at %s is of class %s.", 
@@ -108,7 +107,6 @@ void sensor(void) {
        if (game.state.plnets[iplnet].crystals == 0) proutn(" no");
        prout(" dilithium crystals present.\"");
        if (game.state.plnets[iplnet].known == unknown) game.state.plnets[iplnet].known = known;
-#ifdef SERGEEV
     }
 #endif /* SERGEEV */
 }

diff --git a/sst.c b/sst.c
index 409b489520104737673bfa7bf41782906ee49f94..346bb4c740c4a697ed76451183eadf6375f923b9 100644 (file)
--- a/sst.c
+++ b/sst.c
@@ -261,8 +261,9 @@ static void helpme(void) {
        fclose(fp);
 }
 
+void drawmaps(short l) {
+/* hook to be called after moving to redraw maps */
 #ifdef SERGEEV
-void drawmaps(short l){
      _setcursortype(_NOCURSOR);
      if (l==1) sensor();
      if (l!=2) setwnd(1);
@@ -279,8 +280,8 @@ void drawmaps(short l){
         lrscan();
         _setcursortype(_NORMALCURSOR);
      }
-}
 #endif /* SERGEEV */
+}
 
 static void makemoves(void) {
        int i, hitme;
@@ -289,9 +290,7 @@ static void makemoves(void) {
         setwnd(4);
 #endif /* SERGEEV */
        while (TRUE) { /* command loop */
-#ifdef SERGEEV
                 drawmaps(1);
-#endif /* SERGEEV */
                 while (TRUE)  { /* get a command */
                        hitme = FALSE;
                        justin = 0;

diff --git a/sst.h b/sst.h
index da406c1770472f2f8d1b490837211d2b189be10e..9c964fa18089d323092f9ef76801a78cc435caa2 100644 (file)
--- a/sst.h
+++ b/sst.h
@@ -423,9 +423,7 @@ int isit(char *);
 void preport(void);
 void orbit(void);
 void sensor(void);
-#ifdef SERGEEV
 void drawmaps(short);
-#endif /* SERGEEV */
 void beam(void);
 void mine(void);
 void usecrystals(void);
@@ -438,16 +436,12 @@ void probe(void);
 void clearscreen(void);
 void iostart(int);
 void ioend(void);
-#ifdef SERGEEV
 void setwnd(short);
-#endif /* SERGEEV */
 void warble(void);
 void getline(char *, int);
 void commandhook(char *, int);
 
-#ifdef SERGEEV
 typedef struct {
         int wndleft,wndtop,wndright,wndbottom;
 } wnd;
 extern wnd wnds[6];
-#endif /* SERGEEV */

diff --git a/sstlinux.c b/sstlinux.c
index b376b399b30c4e6ed9a120d3d7598c0cb5a6c3a7..316d58a90126b9a131207807d395343b4d880351 100644 (file)
--- a/sstlinux.c
+++ b/sstlinux.c
@@ -10,6 +10,7 @@
 
 static int fd = 0;
 
+#ifdef SERGEEV
 int c_printf (char *format, ... )
 {
     char buffer[BUFSIZ]; /* Well, BUFSIZ is from ncurses...  */
@@ -19,6 +20,7 @@ int c_printf (char *format, ... )
     va_end(argp);
     return waddstr(conio_scr,buffer);
 }
+#endif /* SERGEEV */
 
 void sound(unsigned int freq)
 {

diff --git a/sstlinux.h b/sstlinux.h
index e4d4ea3b8c28e00a81c13ce215279e4dbce31e22..779f8eb50f5f451d351c2787fe7d6657135554fc 100644 (file)
--- a/sstlinux.h
+++ b/sstlinux.h
@@ -5,9 +5,7 @@ int c_printf (char *format, ... );
 void sound(unsigned int);
 void nosound(void);
 
-#ifdef SERGEEV
 extern WINDOW *conio_scr;
-#endif /* SERGEEV */
 
 #define delay(x) usleep(x*1000)
 #define randomize() srand((unsigned)time(NULL))