Merge branch 'maint' into HEAD

[gnushogi.git] / gnushogi / util.c

diff --git a/gnushogi/util.c b/gnushogi/util.c
index af57cae..96c702f 100644 (file)
--- a/gnushogi/util.c
+++ b/gnushogi/util.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
  *
@@ -35,9 +36,9 @@ unsigned int TTadd = 0;
 short recycle;
 short ISZERO = 1;
 
-
+#if 0
 int
-parse(FILE * fd, unsigned short *mv, short side, char *opening)
+parse(FILE * fd, unsigned short *mv, char *opening)
 {
     int c, i, r1, r2, c1, c2;
     char s[128];
@@ -84,10 +85,10 @@ parse(FILE * fd, unsigned short *mv, short side, char *opening)
         return 0;
     }
 
-    c1 = COL_NAME(s[0]);
-    r1 = ROW_NAME(s[1]);
-    c2 = COL_NAME(s[2]);
-    r2 = ROW_NAME(s[3]);
+    c1 = COL_NUM(s[0]);
+    r1 = ROW_NUM(s[1]);
+    c2 = COL_NUM(s[2]);
+    r2 = ROW_NUM(s[3]);
     *mv = (locn(r1, c1) << 8) | locn(r2, c2);
 
     if (c == '?')
@@ -99,7 +100,7 @@ parse(FILE * fd, unsigned short *mv, short side, char *opening)
 
     return 1;
 }
-
+#endif
 
 /*
  * The field of a hashtable is computed as follows:
@@ -173,7 +174,7 @@ ProbeTTable (short side,
             {
                 HashCol++;
 
-                if (!barebones)
+                if (!XSHOGI)
                 {
                     ShowMessage("ttable collision detected");
                     ShowBD(ptbl->bd);
@@ -226,7 +227,6 @@ PutInTTable(short side,
             short score,
             short depth,
             short ply,
-            short alpha,
             short beta,
             unsigned short mv)
 {