Fix typeMask

[gnushogi.git] / gnushogi / genmove.c

diff --git a/gnushogi/genmove.c b/gnushogi/genmove.c
index 988d0fa..2f4db1b 100644 (file)
--- a/gnushogi/genmove.c
+++ b/gnushogi/genmove.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
  *
@@ -245,7 +246,7 @@ gives_check_flag(unsigned short *flags, short side, short f, short t)
 
 
 inline static void
-Link(short side, short piece,
+Link(short side,
      short from, short to, unsigned short local_flag, short s)
 {
     if (*TrP == TREE)
@@ -322,26 +323,12 @@ PromotionPossible(short color, short f, short t, short p)
             return false;
     }
 
-    /* FIXME: this can be simplified... */
-    switch (p)
-    {
-    case pawn:
-#ifndef MINISHOGI
-    case lance:
-    case knight:
-#endif
-    case silver:
-    case bishop:
-    case rook:
-        return true;
-    };
-
-    return false;
+    return (typeMask[p] & (T_PAWN|T_LANCE|T_KNIGHT|T_SILVER|T_BISHOP|T_ROOK)) != 0;
 }
 
 
-inline int
-NonPromotionPossible(short color, short f,
+static inline int
+NonPromotionPossible(short color,
                      short t, short p)
 {
     switch (p)
@@ -349,13 +336,21 @@ NonPromotionPossible(short color, short f,
     case pawn :
         if (color == black)
         {
+#ifdef MINISHOGI
+            return ((t < 20)
+#else
             return ((t < 72)
+#endif
                     ? true
                     : (generate_move_flags ? ILLEGAL_TRAPPED : false));
         }
         else
         {
+#ifdef MINISHOGI
+            return ((t > 4)
+#else
             return ((t > 8)
+#endif
                     ? true
                     : (generate_move_flags ? ILLEGAL_TRAPPED : false));
         }
@@ -400,7 +395,7 @@ NonPromotionPossible(short color, short f,
 /* bonus for possible next moves */
 
 inline static short
-field_bonus(short ply, short side, short piece,
+field_bonus(short side, short piece,
             short f, short t, unsigned short *local_flag)
 {
     short s, u, ptyp;
@@ -537,10 +532,7 @@ field_bonus(short ply, short side, short piece,
 
                     /* CHECKME: is this right? */
                     if (((rvupiece == rvuboard) && (upiece == pawn))
-                        || (upiece == bishop)
-#ifndef MINISHOGI
-                       || (upiece == knight)
-#endif
+                        || typeMask[upiece] & (T_BISHOP | T_KNIGHT)
                        )
                     {
                         s++; /* The opposing pawn (piece) */
@@ -620,7 +612,7 @@ LinkMove(short ply, short f,
     if (score_if_impossible < 0)
     {
         /* The move is flagged as illegal. */
-        Link(side, piece,
+        Link(side,
              f, t, local_flag, score_if_impossible);
 
         return;
@@ -729,7 +721,7 @@ LinkMove(short ply, short f,
             s -= 16 / Captured[side][silver];
 
 #if defined DROPBONUS
-        s += field_bonus(ply, side, piece, f, t, &local_flag);
+        s += field_bonus(side, piece, f, t, &local_flag);
 
         if (s == 10 && piece != pawn)
             local_flag |= questionable;
@@ -780,11 +772,7 @@ LinkMove(short ply, short f,
             {
 #ifdef TESUJIBONUS
                 /* Look at non-promoting silver or knight */
-                if (piece == silver
-#ifndef MINISHOGI
-                   || piece == knight
-#endif
-                   )
+                if (typeMask[piece] & (T_SILVER | T_KNIGHT))
                 {
                     local_flag |= tesuji; /* Non-promotion */
                     s++;
@@ -818,7 +806,7 @@ LinkMove(short ply, short f,
         else
         {
 #if defined FIELDBONUS
-            s += field_bonus(ply, side, piece, f, t, &local_flag);
+            s += field_bonus(side, piece, f, t, &local_flag);
 #endif
         }
     }
@@ -870,7 +858,7 @@ LinkMove(short ply, short f,
 
     if (try_link || GenerateAllMoves)
     {
-        Link(side, piece, f, t, local_flag,
+        Link(side, f, t, local_flag,
              s - ((SCORE_LIMIT + 1000) * 2));
     }
 
@@ -1040,7 +1028,7 @@ GenMoves(short ply, short sq, short side,
                 LinkMove(ply, sq, u, local_flag | promote, xside, true);
 
                 if ((possible
-                     = NonPromotionPossible(color[sq], sq, u, piece)))
+                     = NonPromotionPossible(color[sq], u, piece)))
                 {
                     LinkMove(ply, sq, u, local_flag, xside, possible);
                 }
@@ -1126,11 +1114,7 @@ LinkPreventCheckDrops(short side, short xside, short ply)
 
     for (piece = pawn+1; piece <= rook; piece++)
     {
-        if (
-#ifndef MINISHOGI
-           piece == lance ||
-#endif
-           piece == bishop || piece == rook)
+        if (typeMask[piece] & (T_LANCE | T_BISHOP | T_ROOK))
         {
             /* check for threat of xside piece */
             ptyp = ptype[side][piece];
@@ -1496,7 +1480,7 @@ CaptureList(short side, short ply,
 
                     if ((PP = PromotionPossible(color[sq], sq, u, piece)))
                     {
-                        Link(side, piece,
+                        Link(side,
                              sq, u, capture | promote,
                              (*value)[stage][board[u]]
 #if !defined SAVE_SVALUE
@@ -1507,7 +1491,7 @@ CaptureList(short side, short ply,
 
                     if (!PP || flag.tsume)
                     {
-                        Link(side, piece,
+                        Link(side,
                              sq, u, capture,
                              (*value)[stage][board[u]]
 #if !defined SAVE_SVALUE