Rollup patch.

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

diff --git a/src/io.c b/src/io.c
index b60fec51645f9d8ba8c597c14e63e28677f1814c..e218c3ee7d2fc191624a7d092262969adb2e36a9 100644 (file)
--- a/src/io.c
+++ b/src/io.c
@@ -19,12 +19,12 @@ static void outro(void)
 /* wrap up, either normally or due to signal */
 {
     if (game.options & OPTION_CURSES) {
-       clear();
-       curs_set(1);
-       (void)refresh();
-       (void)resetterm();
-       //(void)echo();
-       (void)endwin();
+       //clear();
+       //curs_set(1);
+       //refresh();
+       //resetterm();
+       //echo();
+       endwin();
        putchar('\n');
     }
     if (logfp)
@@ -85,11 +85,11 @@ void waitfor(void)
        getch();
 }
 
-void pause_game(int i) 
+void pause_game(bool announcement) 
 {
     char *prompt;
     char buf[BUFSIZ];
-    if (i==1) {
+    if (announcement) {
        if (game.skill > SKILL_FAIR)
            prompt = _("[ANOUNCEMENT ARRIVING...]");
        else
@@ -115,7 +115,7 @@ void pause_game(int i)
        putchar('\n');
        proutn(prompt);
        fgets(buf, sizeof(buf), stdin);
-       if (i != 0) {
+       if (announcement) {
            int j;
            for (j = 0; j < rows; j++)
                putchar('\n');
@@ -130,7 +130,7 @@ void skip(int i)
     while (i-- > 0) {
        if (game.options & OPTION_CURSES) {
            if (curwnd == message_window && linecount >= getmaxy(curwnd) - 3) {
-               pause_game(0);
+               pause_game(false);
                clrscr();
            } else {
                proutn("\n");
@@ -140,7 +140,7 @@ void skip(int i)
        } else {
            linecount++;
            if (linecount >= rows)
-               pause_game(0);
+               pause_game(false);
            else
                putchar('\n');
        }
@@ -397,7 +397,7 @@ void tracktorpedo(coord w, int l, int i, int n, int iquad)
            skip(1);
        proutn("%d - %d   ", w.x, w.y);
     } else {
-       if (!damaged(DSRSENS) || game.condit==IHDOCKED) {
+       if (!damaged(DSRSENS) || game.condition==docked) {
            if (i != 1 && l == 1) {
                drawmaps(2);
                delay(400);