Imported Debian patch 0.52-7

[pkg/netris.git] / curses.c

diff --git a/curses.c b/curses.c
index dc708bd4b4ce5f03d1c6dc0cb8a389c78e348cc5..14e9ce47e32b796ab3c61732d65e5b18a366974f 100644 (file)
--- a/curses.c
+++ b/curses.c
@@ -20,10 +20,8 @@
  */
 
 #include "netris.h"
-#include <time.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <term.h>
 #include <curses.h>
 #include <string.h>
 #include <stdlib.h>
@@ -59,7 +57,6 @@ static EventGenRec keyGen =
 static int boardYPos[MAX_SCREENS], boardXPos[MAX_SCREENS];
 static int statusYPos, statusXPos;
 static int haveColor;
-static int screens_dirty = 0;
 
 static char *term_vi;  /* String to make cursor invisible */
 static char *term_ve;  /* String to make cursor visible */
@@ -101,7 +98,6 @@ ExtFunc void InitScreens(void)
 #endif
 
        AtExit(CleanupScreens);
-       screens_dirty = 1;
        RestoreSignals(NULL, &oldMask);
 
        cbreak();
@@ -120,12 +116,9 @@ ExtFunc void InitScreens(void)
 
 ExtFunc void CleanupScreens(void)
 {
-       if (screens_dirty) {
-               RemoveEventGen(&keyGen);
-               endwin();
-               OutputTermStr(term_ve, 1);
-               screens_dirty = 0;
-       }
+       RemoveEventGen(&keyGen);
+       endwin();
+       OutputTermStr(term_ve, 1);
 }
 
 ExtFunc void GetTermcapInfo(void)
@@ -208,8 +201,6 @@ ExtFunc void InitScreen(int scr)
        for (y = boardVisible[scr] - 1; y >= 0; --y) {
                move(boardYPos[scr] - y, boardXPos[scr] - 1);
                addch('|');
-               for (x = boardWidth[scr] - 1; x >= 0; --x)
-                       addstr("  ");
                move(boardYPos[scr] - y, boardXPos[scr] + 2 * boardWidth[scr]);
                addch('|');
        }
@@ -265,29 +256,6 @@ ExtFunc void PlotUnderline(int scr, int x, int flag)
 
 ExtFunc void ShowDisplayInfo(void)
 {
-       if (game == GT_classicTwo) {
-               move(statusYPos - 5, statusXPos);
-               printw("Enemy lines: %3d/%4d", enemyLinesCleared, enemyTotalLinesCleared);
-       }
-       move(statusYPos - 4, statusXPos);
-       printw("My lines:    %3d/%4d", myLinesCleared, myTotalLinesCleared);
-       move(statusYPos - 3, statusXPos);
-       printw("Won:  %3d", won);
-       move(statusYPos - 2, statusXPos);
-       printw("Lost: %3d", lost);
-
-       move(statusYPos - 1, statusXPos);
-       switch(gameState) {
-       case STATE_WAIT_CONNECTION:
-               addstr("Waiting for opponent...      ");
-               break;
-       case STATE_WAIT_KEYPRESS:
-               addstr("Press the key for a new game.");
-               break;
-       default:
-               addstr("                             ");
-       }
-
        move(statusYPos - 9, statusXPos);
        printw("Seed: %d", initSeed);
        clrtoeol();
@@ -295,7 +263,7 @@ ExtFunc void ShowDisplayInfo(void)
        printw("Speed: %dms", speed / 1000);
        clrtoeol();
        if (robotEnable) {
-               move(statusYPos - 7, statusXPos);
+               move(statusYPos - 6, statusXPos);
                if (fairRobot)
                        addstr("Controlled by a fair robot");
                else
@@ -303,7 +271,7 @@ ExtFunc void ShowDisplayInfo(void)
                clrtoeol();
        }
        if (opponentFlags & SCF_usingRobot) {
-               move(statusYPos - 6, statusXPos);
+               move(statusYPos - 5, statusXPos);
                if (opponentFlags & SCF_fairRobot)
                        addstr("The opponent is a fair robot");
                else