Get rid of FORTRANisms.

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

diff --git a/io.c b/io.c
index 6899ab02a2a1cdea8deaf87ae4a8b8029dab4c62..fc173f7182c0baac431cdb9363a5279f6447ed68 100644 (file)
--- a/io.c
+++ b/io.c
@@ -5,7 +5,6 @@
 #include <signal.h>
 #include <ctype.h>
 #include <stdarg.h>
-#include <time.h>
 
 #include "sst.h"
 #include "sstlinux.h"
@@ -44,27 +43,26 @@ void iostart(int usecurses)
        (void)saveterm();
        (void)nonl();
        (void)cbreak();
-#ifdef FOO
+#ifdef A_COLOR
        {
-       int background = COLOR_WHITE;
        start_color();
-       init_pair(COLOR_BLACK, COLOR_BLACK, background);
-       init_pair(COLOR_GREEN, COLOR_GREEN, background);
-       init_pair(COLOR_RED, COLOR_RED, background);
-       init_pair(COLOR_CYAN, COLOR_CYAN, background);
-       init_pair(COLOR_WHITE, COLOR_WHITE, background);
-       init_pair(COLOR_MAGENTA, COLOR_MAGENTA, background);
-       init_pair(COLOR_BLUE, COLOR_BLUE, background);
-       init_pair(COLOR_YELLOW, COLOR_YELLOW, background);
+       init_pair(COLOR_BLACK, COLOR_BLACK, COLOR_BLACK);
+       init_pair(COLOR_GREEN, COLOR_GREEN, COLOR_BLACK);
+       init_pair(COLOR_RED, COLOR_RED, COLOR_BLACK);
+       init_pair(COLOR_CYAN, COLOR_CYAN, COLOR_BLACK);
+       init_pair(COLOR_WHITE, COLOR_WHITE, COLOR_BLACK);
+       init_pair(COLOR_MAGENTA, COLOR_MAGENTA, COLOR_BLACK);
+       init_pair(COLOR_BLUE, COLOR_BLUE, COLOR_BLACK);
+       init_pair(COLOR_YELLOW, COLOR_YELLOW, COLOR_BLACK);
        }
 #endif /* A_COLOR */
        //(void)noecho();
        fullscreen_window = stdscr;
        srscan_window     = newwin(12, 25, 0,       0);
-       REPORT_WINDOW     = newwin(10, 0,  1,       25);
+       report_window     = newwin(10, 0,  1,       25);
        lrscan_window     = newwin(10, 0,  0,       64); 
-       message_window      = newwin(0,  0,  12,      0);
-       prompt_window     = newwin(1,  0,  LINES-1, 0); 
+       message_window    = newwin(0,  0,  12,      0);
+       prompt_window     = newwin(1,  0,  LINES-2, 0); 
        scrollok(message_window, TRUE);
        setwnd(fullscreen_window);
        textcolor(DEFAULT);
@@ -84,13 +82,13 @@ void pause_game(int i)
     char *prompt;
     char buf[BUFSIZ];
     if (i==1) {
-       if (skill > 2)
+       if (skill > SKILL_FAIR)
            prompt = "[ANOUNCEMENT ARRIVING...]";
        else
            prompt = "[IMPORTANT ANNOUNCEMENT ARRIVING -- PRESS ENTER TO CONTINUE]";
     }
     else {
-       if (skill > 2)
+       if (skill > SKILL_FAIR)
            prompt = "[CONTINUE?]";
        else
            prompt = "[PRESS ENTER TO CONTINUE]";
@@ -164,7 +162,6 @@ void prout(char *fmt, ...)
 void prouts(char *fmt, ...) 
 /* print slowly! */
 {
-    clock_t endTime;
     char *s, buf[BUFSIZ];
     va_list ap;
     va_start(ap, fmt);
@@ -172,8 +169,7 @@ void prouts(char *fmt, ...)
     va_end(ap);
     skip(1);
     for (s = buf; *s; s++) {
-       endTime = clock() + CLOCKS_PER_SEC*0.05;
-       while (clock() < endTime) continue;
+       delay(500);
        if (curses) {
            waddch(curwnd, *s);
            wrefresh(curwnd);
@@ -227,64 +223,63 @@ void clrscr (void)
 
 void textcolor (int color)
 {
+#ifdef A_COLOR
     if (curses) {
-       wattroff(curwnd, A_REVERSE);
-#ifdef FOO
        switch(color) {
        case DEFAULT: 
            wattrset(curwnd, 0);
            break;
        case BLACK: 
-           wattron(curwnd, COLOR_PAIR(BLACK));
+           wattron(curwnd, COLOR_PAIR(COLOR_BLACK));
            break;
        case BLUE: 
-           wattron(curwnd, COLOR_PAIR(BLUE));
+           wattron(curwnd, COLOR_PAIR(COLOR_BLUE));
            break;
        case GREEN: 
-           wattron(curwnd, COLOR_PAIR(GREEN));
+           wattron(curwnd, COLOR_PAIR(COLOR_GREEN));
            break;
        case CYAN: 
-           wattron(curwnd, COLOR_PAIR(CYAN));
+           wattron(curwnd, COLOR_PAIR(COLOR_CYAN));
            break;
        case RED: 
-           wattron(curwnd, COLOR_PAIR(RED));
+           wattron(curwnd, COLOR_PAIR(COLOR_RED));
            break;
        case MAGENTA: 
-           wattron(curwnd, COLOR_PAIR(MAGENTA));
+           wattron(curwnd, COLOR_PAIR(COLOR_MAGENTA));
            break;
        case BROWN: 
-           wattron(curwnd, COLOR_PAIR(YELLOW));
+           wattron(curwnd, COLOR_PAIR(COLOR_YELLOW));
            break;
        case LIGHTGRAY: 
-           wattron(curwnd, COLOR_PAIR(WHITE));
+           wattron(curwnd, COLOR_PAIR(COLOR_WHITE));
            break;
        case DARKGRAY: 
-           wattron(curwnd, COLOR_PAIR(BLACK) | A_BOLD);
+           wattron(curwnd, COLOR_PAIR(COLOR_BLACK) | A_BOLD);
            break;
        case LIGHTBLUE: 
-           wattron(curwnd, COLOR_PAIR(BLUE) | A_BOLD);
+           wattron(curwnd, COLOR_PAIR(COLOR_BLUE) | A_BOLD);
            break;
        case LIGHTGREEN: 
-           wattron(curwnd, COLOR_PAIR(GREEN) | A_BOLD);
+           wattron(curwnd, COLOR_PAIR(COLOR_GREEN) | A_BOLD);
            break;
        case LIGHTCYAN: 
-           wattron(curwnd, COLOR_PAIR(CYAN) | A_BOLD);
+           wattron(curwnd, COLOR_PAIR(COLOR_CYAN) | A_BOLD);
            break;
        case LIGHTRED: 
-           wattron(curwnd, COLOR_PAIR(RED) | A_BOLD);
+           wattron(curwnd, COLOR_PAIR(COLOR_RED) | A_BOLD);
            break;
        case LIGHTMAGENTA: 
-           wattron(curwnd, COLOR_PAIR(MAGENTA) | A_BOLD);
+           wattron(curwnd, COLOR_PAIR(COLOR_MAGENTA) | A_BOLD);
            break;
        case YELLOW: 
-           wattron(curwnd, COLOR_PAIR(YELLOW) | A_BOLD);
+           wattron(curwnd, COLOR_PAIR(COLOR_YELLOW) | A_BOLD);
            break;
        case WHITE:
-           wattron(curwnd, COLOR_PAIR(WHITE) | A_BOLD);
+           wattron(curwnd, COLOR_PAIR(COLOR_WHITE) | A_BOLD);
            break;
        }
-#endif /* FOO */
     }
+#endif /* A_COLOR */
 }
 
 void highvideo (void)
@@ -312,9 +307,9 @@ void drawmaps(short l)
            wmove(curwnd, 0, 0);
            enqueue("no");
            srscan(SCAN_FULL);
-           setwnd(REPORT_WINDOW);
-           wclear(REPORT_WINDOW);
-           wmove(REPORT_WINDOW, 0, 0);
+           setwnd(report_window);
+           wclear(report_window);
+           wmove(report_window, 0, 0);
            srscan(SCAN_NO_LEFTSIDE);
            setwnd(lrscan_window);
            wclear(lrscan_window);