X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=moves.c;h=354c70d26387a7d448e17854af98e1596ebd753b;hb=a3e7cc9b3eb04ffb69fd73b47c06758f73316373;hp=0d8d1460fa87d03b44406aef53af43c7138c5826;hpb=545c9779f7df75b584e19417fa24f82479e10c11;p=xboard.git

diff --git a/moves.c b/moves.c
index 0d8d146..354c70d 100644
--- a/moves.c
+++ b/moves.c
@@ -736,7 +736,15 @@ void GenLegalCallback(board, flags, kind, rf, ff, rt, ft, closure)
 
     if (!(flags & F_IGNORE_CHECK) ) {
       int check, promo = (gameInfo.variant == VariantSpartan && kind == BlackPromotion);
-      if(promo) board[rf][ff] = BlackKing; // [HGM] spartan: promote to King before check-test
+      if(promo) {
+	    int r, f, kings=0;
+	    for(r=0; r<BOARD_HEIGHT; r++) for(f=BOARD_LEFT; f<BOARD_RGHT;	f++)
+		kings += (board[r][f] == BlackKing);
+	    if(kings >= 2)
+	      promo = 0;
+	    else
+		board[rf][ff] = BlackKing; // [HGM] spartan: promote to King before check-test
+	}
 	check = CheckTest(board, flags, rf, ff, rt, ft,
 		  kind == WhiteCapturesEnPassant ||
 		  kind == BlackCapturesEnPassant);
@@ -1003,16 +1011,18 @@ int CheckTest(board, flags, rf, ff, rt, ft, enPassant)
     if(gameInfo.variant == VariantKnightmate)
         king = flags & F_WHITE_ON_MOVE ? WhiteUnicorn : BlackUnicorn;
 
-    if (rf >= 0) {
+    if (rt >= 0) {
 	if (enPassant) {
 	    captured = board[rf][ft];
 	    board[rf][ft] = EmptySquare;
 	} else {
 	    captured = board[rt][ft];
 	}
-	board[rt][ft] = board[rf][ff];
-	board[rf][ff] = EmptySquare;
-    } else board[rt][ft] = ff; // [HGM] drop
+	if(rf == DROP_RANK) board[rt][ft] = ff; else { // [HGM] drop
+	    board[rt][ft] = board[rf][ff];
+	    board[rf][ff] = EmptySquare;
+	}
+    }
 
     /* For compatibility with ICS wild 9, we scan the board in the
        order a1, a2, a3, ... b1, b2, ..., h8 to find the first king,
@@ -1039,15 +1049,16 @@ int CheckTest(board, flags, rf, ff, rt, ft, enPassant)
 
   undo_move:
 
-    if (rf >= 0) {
-	board[rf][ff] = board[rt][ft];
+    if (rt >= 0) {
+	if(rf != DROP_RANK) // [HGM] drop
+	    board[rf][ff] = board[rt][ft];
 	if (enPassant) {
 	    board[rf][ft] = captured;
 	    board[rt][ft] = EmptySquare;
 	} else {
 	    board[rt][ft] = captured;
 	}
-    } else board[rt][ft] = EmptySquare; // [HGM] drop
+    }
 
     return cl.fking < BOARD_RGHT ? cl.check : 1000; // [HGM] atomic: return 1000 if we have no king
 }
@@ -1273,7 +1284,7 @@ int MateTest(board, flags)
 	return inCheck ? MT_CHECK : MT_NONE;
     } else {
         if(gameInfo.holdingsWidth && gameInfo.variant != VariantSuper && gameInfo.variant != VariantGreat
-                                                                      && gameInfo.variant != VariantGrand) { // drop game
+                                 && gameInfo.variant != VariantSChess && gameInfo.variant != VariantGrand) { // 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
@@ -1947,5 +1958,6 @@ int PerpetualChase(int first, int last)
             }
         }
     }
-    return preyStackPointer; // if any piece was left on preyStack, it has been perpetually chased
+    return preyStackPointer ? 256*(preyStack[preyStackPointer].file - BOARD_LEFT + AAA) + (preyStack[preyStackPointer].rank + ONE)
+				: 0; // if any piece was left on preyStack, it has been perpetually chased,and we return the
 }