X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=moves.c;h=af04d1eb10ec77c4703837113bbc83ab09af02a9;hb=bb1c0f39816daca49f22a751768be6cf9f4fc9a2;hp=12f9b63ddba1e383c96018323498365255557c75;hpb=941395daf4333598be57255c9b722c7c09b3adf3;p=xboard.git

diff --git a/moves.c b/moves.c
index 12f9b63..af04d1e 100644
--- a/moves.c
+++ b/moves.c
@@ -5,7 +5,7 @@
  * Massachusetts.
  *
  * Enhancements Copyright 1992-2001, 2002, 2003, 2004, 2005, 2006,
- * 2007, 2008, 2009 Free Software Foundation, Inc.
+ * 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
  *
  * Enhancements Copyright 2005 Alessandro Scotti
  *
@@ -263,6 +263,7 @@ void GenPseudoLegal(board, flags, callback, closure)
     int rf, ff;
     int i, j, d, s, fs, rs, rt, ft, m;
     int epfile = (signed char)board[EP_STATUS]; // [HGM] gamestate: extract ep status from board
+    int promoRank = gameInfo.variant == VariantMakruk ? 3 : 1;
 
     for (rf = 0; rf < BOARD_HEIGHT; rf++) 
       for (ff = BOARD_LEFT; ff < BOARD_RGHT; ff++) {
@@ -306,7 +307,7 @@ void GenPseudoLegal(board, flags, callback, closure)
               }
               if (rf < BOARD_HEIGHT-1 && board[rf + 1][ff] == EmptySquare) {
 		  callback(board, flags,
-			   rf == BOARD_HEIGHT-2 ? WhitePromotionQueen : NormalMove,
+			   rf >= BOARD_HEIGHT-1-promoRank ? WhitePromotionQueen : NormalMove,
 			   rf, ff, rf + 1, ff, closure);
 	      }
 	      if (rf == 1 && board[2][ff] == EmptySquare &&
@@ -321,7 +322,7 @@ void GenPseudoLegal(board, flags, callback, closure)
 		      ((flags & F_KRIEGSPIEL_CAPTURE) ||
 		       BlackPiece(board[rf + 1][ff + s]))) {
 		      callback(board, flags, 
-			       rf == BOARD_HEIGHT-2 ? WhitePromotionQueen : NormalMove,
+			       rf >= BOARD_HEIGHT-1-promoRank ? WhitePromotionQueen : NormalMove,
 			       rf, ff, rf + 1, ff + s, closure);
 		  }
 		  if (rf == BOARD_HEIGHT-4) {
@@ -356,7 +357,7 @@ void GenPseudoLegal(board, flags, callback, closure)
               }
 	      if (rf > 0 && board[rf - 1][ff] == EmptySquare) {
 		  callback(board, flags, 
-			   rf == 1 ? BlackPromotionQueen : NormalMove,
+			   rf <= promoRank ? BlackPromotionQueen : NormalMove,
 			   rf, ff, rf - 1, ff, closure);
 	      }
 	      if (rf == BOARD_HEIGHT-2 && board[BOARD_HEIGHT-3][ff] == EmptySquare &&
@@ -371,7 +372,7 @@ void GenPseudoLegal(board, flags, callback, closure)
 		      ((flags & F_KRIEGSPIEL_CAPTURE) ||
 		       WhitePiece(board[rf - 1][ff + s]))) {
 		      callback(board, flags, 
-			       rf == 1 ? BlackPromotionQueen : NormalMove,
+			       rf <= promoRank ? BlackPromotionQueen : NormalMove,
 			       rf, ff, rf - 1, ff + s, closure);
 		  }
 		  if (rf == 3) {
@@ -611,6 +612,8 @@ void GenPseudoLegal(board, flags, callback, closure)
 
             /* Shogi Pawn and Silver General: first the Pawn move,    */
             /* then the General continues like a Ferz                 */
+            case WhiteMan:
+                if(gameInfo.variant != VariantMakruk) goto commoner;
             case SHOGI WhitePawn:
             case SHOGI WhiteFerz:
                   if (rf < BOARD_HEIGHT-1 &&
@@ -620,6 +623,8 @@ void GenPseudoLegal(board, flags, callback, closure)
               if(piece != SHOGI WhitePawn) goto finishSilver;
               break;
 
+            case BlackMan:
+                if(gameInfo.variant != VariantMakruk) goto commoner;
             case SHOGI BlackPawn:
             case SHOGI BlackFerz:
                   if (rf > 0 &&
@@ -647,8 +652,7 @@ void GenPseudoLegal(board, flags, callback, closure)
 	    case WhiteSilver:
 	    case BlackSilver:
 		m++; // [HGM] superchess: use for Centaur
-            case WhiteMan:
-            case BlackMan:
+            commoner:
             case SHOGI WhiteKing:
             case SHOGI BlackKing:
 	    case WhiteKing:
@@ -855,7 +859,7 @@ int GenLegal(board, flags, callback, closure)
 	}
     }
 
-  if(gameInfo.variant == VariantFischeRandom) {
+  if(flags & F_FRC_TYPE_CASTLING) {
 
     /* generate all potential FRC castling moves (KxR), ignoring flags */
     /* [HGM] test if the Rooks we find have castling rights */
@@ -1219,12 +1223,16 @@ void DisambiguateCallback(board, flags, kind, rf, ff, rt, ft, closure)
 	(cl->ftIn == -1 || cl->ftIn == ft || wildCard)) {
 
 	cl->count++;
-        cl->piece = board[rf][ff];
-	cl->rf = rf;
-	cl->ff = ff;
-	cl->rt = wildCard ? cl->rtIn : rt;
-	cl->ft = wildCard ? cl->ftIn : ft;
-	cl->kind = kind;
+	if(cl->count == 1 || board[rt][ft] != EmptySquare) {
+	  // [HGM] oneclick: if multiple moves, be sure we remember capture
+	  cl->piece = board[rf][ff];
+	  cl->rf = rf;
+	  cl->ff = ff;
+	  cl->rt = wildCard ? cl->rtIn : rt;
+	  cl->ft = wildCard ? cl->ftIn : ft;
+	  cl->kind = kind;
+	}
+	cl->captures += (board[cl->rt][cl->ft] != EmptySquare); // [HGM] oneclick: count captures
     }
 }
 
@@ -1235,7 +1243,7 @@ void Disambiguate(board, flags, closure)
 {
     int illegal = 0; char c = closure->promoCharIn;
 
-    closure->count = 0;
+    closure->count = closure->captures = 0;
     closure->rf = closure->ff = closure->rt = closure->ft = 0;
     closure->kind = ImpossibleMove;
     if (appData.debugMode) {