X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=71a795c05a7cbf6b323b33650dfb09048ce6a3ac;hb=f9f3643ce3447c431ee266ff241cad393872d416;hp=674a9d30870c0577ccc8f842cf95b4018f7e26a3;hpb=34349ddea87670e7208786d96e1af00dc6fc5df0;p=xboard.git

diff --git a/backend.c b/backend.c
index 674a9d3..71a795c 100644
--- a/backend.c
+++ b/backend.c
@@ -5399,8 +5399,8 @@ Sweep (int step)
 	if(step && !(toggleFlag && Partner(&promoSweep))) promoSweep -= step;
 	if(promoSweep == EmptySquare) promoSweep = BlackPawn; // wrap
 	else if((int)promoSweep == -1) promoSweep = WhiteKing;
-	else if(promoSweep == BlackPawn && step < 0) promoSweep = WhitePawn;
-	else if(promoSweep == WhiteKing && step > 0) promoSweep = BlackKing;
+	else if(promoSweep == BlackPawn && step < 0 && !toggleFlag) promoSweep = WhitePawn;
+	else if(promoSweep == WhiteKing && step > 0 && !toggleFlag) promoSweep = BlackKing;
 	if(!step) step = -1;
     } while(PieceToChar(promoSweep) == '.' || PieceToChar(promoSweep) == '~' || promoSweep == pawn ||
 	    !toggleFlag && PieceToChar(promoSweep) == '+' || // skip promoted versions of other
@@ -7519,7 +7519,7 @@ printf("to click %d,%d\n",x,y);
 	toP = boards[currentMove][y][x];
 	frc = appData.fischerCastling || gameInfo.variant == VariantSChess;
  	if( (killX < 0 || x != fromX || y != fromY) && // [HGM] lion: do not interpret igui as deselect!
-	    legal[y][x] == 0 && // if engine told we can move to here, do it even if own piece
+	    marker[y][x] == 0 && // if engine told we can move to here, do it even if own piece
 	   ((WhitePawn <= fromP && fromP <= WhiteKing &&
 	     WhitePawn <= toP && toP <= WhiteKing &&
 	     !(fromP == WhiteKing && toP == WhiteRook && frc) &&
@@ -7574,7 +7574,7 @@ printf("A type=%d\n",clickType);
 	return;
     }
 
-    if (clickType == Release && x == fromX && y == fromY && killX < 0) {
+    if (clickType == Release && x == fromX && y == fromY && killX < 0 && !sweepSelecting) {
 	DragPieceEnd(xPix, yPix); dragging = 0;
 	if(clearFlag) {
 	    // a deferred attempt to click-click move an empty square on top of a piece
@@ -7588,10 +7588,9 @@ printf("A type=%d\n",clickType);
 	    /* Undo animation damage if any */
 	    DrawPosition(FALSE, NULL);
 	}
-	if (second || sweepSelecting) {
+	if (second) {
 	    /* Second up/down in same square; just abort move */
-	    if(sweepSelecting) DrawPosition(FALSE, boards[currentMove]);
-	    second = sweepSelecting = 0;
+	    second = 0;
 	    fromX = fromY = -1;
 	    gatingPiece = EmptySquare;
 	    MarkTargetSquares(1);
@@ -7726,7 +7725,9 @@ printf("(%d,%d)-(%d,%d) %d %d\n",fromX,fromY,toX,toY,x,y);
 
     if(gatingPiece != EmptySquare && gameInfo.variant == VariantSChess) promoChoice = ToLower(PieceToChar(gatingPiece));
 
-    if (HasPromotionChoice(fromX, fromY, toX, toY, &promoChoice, appData.sweepSelect)) {
+    if(legal[toY][toX] == 2) promoChoice = ToLower(PieceToChar(defaultPromoChoice)); // highlight-induced promotion
+
+    if (legal[toY][toX] == 2 || HasPromotionChoice(fromX, fromY, toX, toY, &promoChoice, appData.sweepSelect)) {
 	SetHighlights(fromX, fromY, toX, toY);
         MarkTargetSquares(1);
 	if(gameInfo.variant == VariantSuper || gameInfo.variant == VariantGreat || gameInfo.variant == VariantGrand) {