Fix use of (COL|ROW)_NAME macros to compute numbers from names.

[gnushogi.git] / gnushogi / search.c

diff --git a/gnushogi/search.c b/gnushogi/search.c
index c1d8fd9..84850e7 100644 (file)
--- a/gnushogi/search.c
+++ b/gnushogi/search.c
@@ -4,6 +4,7 @@
  * ----------------------------------------------------------------------
  * Copyright (c) 1993, 1994, 1995 Matthias Mutz
  * Copyright (c) 1999 Michael Vanier and the Free Software Foundation
+ * Copyright (c) 2008, 2013, 2014 Yann Dirson and the Free Software Foundation
  *
  * GNU SHOGI is based on GNU CHESS
  *
@@ -30,8 +31,6 @@
  */
 
 #include "gnushogi.h"
-#include <poll.h>
-#include <unistd.h>
 
 short background = 0;
 static short DepthBeyond;
@@ -409,7 +408,7 @@ SelectMove(short side, SelectMove_mode iop)
     if (rpt >= 3)
     {
         root->flags |= draw;
-        DRAW = CP[101];     /* Repetition */
+        DRAW = DRAW_REPETITION;
     }
     else
     {
@@ -421,7 +420,7 @@ SelectMove(short side, SelectMove_mode iop)
         if (GameCnt == MAXMOVES)
         {
             root->flags |= draw;
-            DRAW = CP[80];      /* Max Moves */
+            DRAW = DRAW_MAXMOVES;
         }
     }
 
@@ -528,8 +527,6 @@ search(short side,
     short best = -(SCORE_LIMIT + 3000);
     short bestwidth = 0;
     short mustcut;
-    static struct pollfd pollfds[1] = { /* [0] = */ { /* .fd = */ STDIN_FILENO,
-                                                      /* .events = */ POLLIN } };
 
 #ifdef NULLMOVE
     short PVsave;
@@ -547,19 +544,6 @@ search(short side,
         {
             ElapsedTime(COMPUTE_MODE);
 
-            if(background) {
-                int cnt = poll(pollfds, sizeof(pollfds)/sizeof(pollfds[0]), 0);
-                if (cnt < 0) {
-                    perror("polling standard input");
-                    ExitShogi();
-                }
-                if (cnt) { /* if anything to read, or error occured */
-                    if (!flag.timeout)
-                        flag.back = true; /* previous: flag.timeout = true; */
-                    flag.bothsides = false;
-                }
-            }
-
             if (flag.back)
             {
                 flag.back = false;
@@ -928,7 +912,7 @@ search(short side,
                      && !ChkFlag[ply])))
             {
                 node->flags |= (draw | exact);
-                DRAW = CP[58];  /* Draw */
+                DRAW = DRAW_JUSTDRAW;
                 node->score = ((side == computer) ? contempt : -contempt);
             }