From: H.G. Muller <h.g.muller@hccnet.nl>
Date: Mon, 3 Jan 2011 11:23:39 +0000 (+0100)
Subject: Fix mate test
X-Git-Url: http://winboard.nl/cgi-bin?a=commitdiff_plain;h=ce28a7755e28a2d0d8d5887d8de1660dd7400340;p=xboard.git

Fix mate test

Due to a bug in logical operators drops were tried for mate evasions
even in non-drop games, which broke it in Superchess and Great Shatranj,
and wasted CPU time in other variants.
---

diff --git a/moves.c b/moves.c
index d8768f4..f0b2af7 100644
--- a/moves.c
+++ b/moves.c
@@ -1221,13 +1221,13 @@ int MateTest(board, flags)
     if (cl.count > 0) {
 	return inCheck ? MT_CHECK : MT_NONE;
     } else {
-        if(gameInfo.holdingsWidth && gameInfo.variant != VariantSuper || gameInfo.variant != VariantGreat) { // drop game
+        if(gameInfo.holdingsWidth && gameInfo.variant != VariantSuper && gameInfo.variant != VariantGreat) { // drop game
             int r, f, n, holdings = flags & F_WHITE_ON_MOVE ? BOARD_WIDTH-1 : 0;
             for(r=0; r<BOARD_HEIGHT; r++) for(f=BOARD_LEFT; f<BOARD_RGHT; f++) if(board[r][f] == EmptySquare) // all empty squares
                 for(n=0; n<BOARD_HEIGHT; n++) // all pieces in hand
                     if(board[n][holdings] != EmptySquare) {
                         int moveType = LegalDrop(board, flags, board[n][holdings], r, f);
-                        if(moveType == WhiteDrop || moveType == BlackDrop) return MT_CHECK; // we can resolve check by legal drop
+                        if(moveType == WhiteDrop || moveType == BlackDrop) return (inCheck ? MT_CHECK : MT_NONE); // we have legal drop
                     }
         }
 	if(gameInfo.variant == VariantSuicide) // [HGM] losers: always stalemate, since no check, but result varies