X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=moves.c;h=17c123955408d90d62fc9e832eb0698266e91e5b;hb=75ec1dc301344d1fe0b6e15592f090d77d567fc0;hp=594bb124edf60047676fadfd4e3f6d13683b8dca;hpb=e3e3615246633473d0ea262f6d3974d6a49cfd01;p=xboard.git

diff --git a/moves.c b/moves.c
index 594bb12..17c1239 100644
--- a/moves.c
+++ b/moves.c
@@ -723,10 +723,15 @@ void GenLegalCallback(board, flags, kind, rf, ff, rt, ft, closure)
 {
     register GenLegalClosure *cl = (GenLegalClosure *) closure;
 
-    if (!(flags & F_IGNORE_CHECK) &&
-	CheckTest(board, flags, rf, ff, rt, ft,
+    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
+	check = CheckTest(board, flags, rf, ff, rt, ft,
 		  kind == WhiteCapturesEnPassant ||
-		  kind == BlackCapturesEnPassant)) return;
+		  kind == BlackCapturesEnPassant);
+	if(promo) board[rf][ff] = BlackLance;
+      if(check) return;
+    }
     if (flags & F_ATOMIC_CAPTURE) {
       if (board[rt][ft] != EmptySquare ||
 	  kind == WhiteCapturesEnPassant || kind == BlackCapturesEnPassant) {
@@ -1167,6 +1172,8 @@ if(appData.debugMode)fprintf(debugFP,"SHOGI promoChar = %c\n", promoChar ? promo
 	if (cl.kind == WhitePromotion || cl.kind == BlackPromotion) {
 	    if(CharToPiece(flags & F_WHITE_ON_MOVE ? ToUpper(promoChar) : ToLower(promoChar)) == EmptySquare)
                 cl.kind = ImpossibleMove; // non-existing piece
+	    if(gameInfo.variant == VariantSpartan && cl.kind == BlackPromotion && promoChar != PieceToChar(BlackKing) &&
+	       CheckTest(board, flags, rf, ff, rt, ft, FALSE)) cl.kind = IllegalMove; // [HGM] spartan: only promotion to King was possible
 	} else {
 	    cl.kind = IllegalMove;
 	}