X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=io.c;h=4ad1c77702bfb7516f1f41ffec0695eaf28b2765;hb=332c6482c6a33c591de1dbcbd66f45f3a8fff499;hp=bff7d46913fe55bedb7b824fb872f16febb60289;hpb=a8f5216ff30142b93e4ff3e9bc12535ed0792563;p=super-star-trek.git

diff --git a/io.c b/io.c
index bff7d46..4ad1c77 100644
--- a/io.c
+++ b/io.c
@@ -9,13 +9,13 @@
 #include <time.h>
 
 #include "conio.h"
-#include "sstlinux.h"
 #include "sst.h"
+#include "sstlinux.h"
 
 #ifndef SERGEEV
 static int linecount;	/* for paging */
-#endif /* SERGEEV */
 static int screenheight = 24, screenwidth = 80;
+#endif /* SERGEEV */
 #ifndef SERGEEV
 static int curses = FALSE;
 #else /* SERGEEV */
@@ -33,6 +33,7 @@ wnd wnds[6]={{1,1,80,25},	/* FULLSCREEN_WINDOW */
 short curwnd;
 #endif /* SERGEEV */
 
+#ifndef SERGEEV
 static void outro(int sig) {
 /* wrap up, either normally or due to signal */
     if (curses) {
@@ -49,9 +50,11 @@ static void fastexit(int sig) {
     putchar('\n');
     exit(0);
 }
+#endif /* SERGEEV */
 
 void iostart(int usecurses) {
 #ifdef SERGEEV
+    	initconio();
         textattr(7);
         clrscr();
         setwnd(FULLSCREEN_WINDOW);
@@ -165,9 +168,11 @@ void skip(int i) {
 	}
 #else /* SERGEEV */
         while (i-- > 0) proutn("\n\r");
+#endif /* SERGEEV */
 }
 
 static void vproutn(char *fmt, va_list ap) {
+#ifdef SERGEEV
     char *s, *p;
     vasprintf(&s, fmt, ap);
     p=s;
@@ -253,8 +258,8 @@ static void vprouts(char *fmt, va_list ap) {
     }
     free(s);
 }
-
 #endif /* SERGEEV */
+
 void prouts(char *fmt, ...) {
 #ifndef SERGEEV
 	clock_t endTime;
@@ -285,20 +290,6 @@ void prouts(char *fmt, ...) {
 #endif /* SERGEEV */
 }
 
-void c_printf (char *format, ... )
-{
-    char buffer[BUFSIZ]; /* Well, BUFSIZ is from ncurses...  */
-    va_list argp;
-    va_start(argp,format);
-    vsprintf(buffer,format,argp);
-    va_end(argp);
-#ifdef SERGEEV
-    waddstr(conio_scr,buffer);
-#else
-    proutn(buffer);
-#endif /* SERGEEV */
-}
-
 void cgetline(char *line, int max) {
     if (curses) {
 #ifndef SERGEEV
@@ -345,15 +336,15 @@ void drawmaps(short l) {
      if (l==1) sensor();
      if (l!=2) setwnd(LEFTUPPER_WINDOW);
      gotoxy(1,1);
-     strcpy(line,"s");
-     srscan(1);
+     enqueue("no");
+     srscan(SCAN_FULL);
      if (l!=2){
         setwnd(SRSCAN_WINDOW);
         clrscr();
-        srscan(2);
+        srscan(SCAN_NO_LEFTSIDE);
         setwnd(LRSCAN_WINDOW);
         clrscr();
-        strcpy(line,"l");
+        enqueue("l");
         lrscan();
         _setcursortype(_NORMALCURSOR);
      }