X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=e4e35508e40515d11922b0c591cbd0873144f95c;hb=4ac8f856998e69684cb3465ffaead92a6a6ed9b1;hp=774784400b7cab2ec9380c596ccb611c1ac16526;hpb=9b4c2f6e576b10ffb1ce3a08edc0bc2f7454bf41;p=xboard.git

diff --git a/backend.c b/backend.c
index 7747844..e4e3550 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
@@ -5527,7 +5527,12 @@ ParseOneMove (char *move, int moveNum, ChessMove *moveType, int *fromX, int *fro
       case BlackASideCastleFR:
       /* End of code added by Tord */
       case IllegalMove:		/* bug or odd chess variant */
-	if(currentMoveString[1] == '@') goto drop; // illegal drop
+	if(currentMoveString[1] == '@') { // illegal drop
+	  *fromX = WhiteOnMove(moveNum) ?
+	    (int) CharToPiece(ToUpper(currentMoveString[0])) :
+	    (int) CharToPiece(ToLower(currentMoveString[0]));
+	  goto drop;
+	}
         *fromX = currentMoveString[0] - AAA;
         *fromY = currentMoveString[1] - ONE;
         *toX = currentMoveString[2] - AAA;
@@ -5551,10 +5556,10 @@ ParseOneMove (char *move, int moveNum, ChessMove *moveType, int *fromX, int *fro
 
       case WhiteDrop:
       case BlackDrop:
-      drop:
 	*fromX = *moveType == WhiteDrop ?
 	  (int) CharToPiece(ToUpper(currentMoveString[0])) :
 	  (int) CharToPiece(ToLower(currentMoveString[0]));
+      drop:
 	*fromY = DROP_RANK;
         *toX = currentMoveString[2] - AAA;
         *toY = currentMoveString[3] - ONE;
@@ -7519,7 +7524,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) &&
@@ -7551,7 +7556,7 @@ printf("to click %d,%d\n",x,y);
 		else gatingPiece = doubleClick ? fromP : EmptySquare;
 		fromX = x;
 		fromY = y; dragging = 1;
-		ReportClick("lift", x, y);
+		if(!second) ReportClick("lift", x, y);
 		MarkTargetSquares(0);
 		DragPieceBegin(xPix, yPix, FALSE);
 		if(appData.sweepSelect && CanPromote(piece = boards[currentMove][y][x], y)) {
@@ -7574,7 +7579,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 +7593,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);
@@ -7728,7 +7732,7 @@ printf("(%d,%d)-(%d,%d) %d %d\n",fromX,fromY,toX,toY,x,y);
 
     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)) {
+    if (legal[toY][toX] == 2 && !appData.sweepSelect || 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) {