X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=cc423343d380fddfdfdc2f784e625e4197cb2362;hb=3a9499276a08d988da5382a453ee089129ffabed;hp=5715e5df5a99fc716b9aedee759c1b08d0b5437c;hpb=c0d0ea91773838e5d11c3cd3b407fea251058c34;p=xboard.git

diff --git a/backend.c b/backend.c
index 5715e5d..cc42334 100644
--- a/backend.c
+++ b/backend.c
@@ -450,7 +450,7 @@ int adjudicateLossPlies = 6;
 char white_holding[64], black_holding[64];
 TimeMark lastNodeCountTime;
 long lastNodeCount=0;
-int shiftKey; // [HGM] set by mouse handler
+int shiftKey, controlKey; // [HGM] set by mouse handler
 
 int have_sent_ICS_logon = 0;
 int movesPerSession;
@@ -851,7 +851,7 @@ LoadEngine ()
     SendToProgram("force\n", savCps);
     DisplayMessage("", "");
     if (startedFromSetupPosition) SendBoard(savCps, backwardMostMove);
-    for (i = backwardMostMove; i < forwardMostMove; i++) SendMoveToProgram(i, savCps);
+    for (i = backwardMostMove; i < currentMove; i++) SendMoveToProgram(i, savCps);
     ThawUI();
     SetGNUMode();
 }
@@ -6664,7 +6664,7 @@ UserMoveEvent(int fromX, int fromY, int toX, int toY, int promoChar)
 		    if(boards[0][fromY][BOARD_WIDTH-2] == 0)  boards[0][fromY][BOARD_WIDTH-1] = EmptySquare;
 		}
 	    } else
-	    boards[0][fromY][fromX] = EmptySquare;
+	    boards[0][fromY][fromX] = gatingPiece;
 	    DrawPosition(FALSE, boards[currentMove]);
 	    return;
 	}
@@ -7060,6 +7060,7 @@ LeftClick (ClickType clickType, int xPix, int yPix)
 	    if (OKToStartUserMove(fromX, fromY)) {
 		second = 0;
 		MarkTargetSquares(0);
+		if(gameMode == EditPosition && controlKey) gatingPiece = boards[currentMove][fromY][fromX];
 		DragPieceBegin(xPix, yPix, FALSE); dragging = 1;
 		if(appData.sweepSelect && CanPromote(piece = boards[currentMove][fromY][fromX], fromY)) {
 		    promoSweep = defaultPromoChoice;
@@ -11515,7 +11516,7 @@ QuickCompare (Board board, int *minCounts, int *maxCounts)
 int
 QuickScan (Board board, Move *move)
 {   // reconstruct game,and compare all positions in it
-    int cnt=0, stretch=0, total = MakePieceList(board, counts);
+    int cnt=0, stretch=0, total = MakePieceList(board, counts), delayedKing = -1;
     do {
 	int piece = move->piece;
 	int to = move->to, from = pieceList[piece];
@@ -11533,18 +11534,22 @@ QuickScan (Board board, Move *move)
 	    move++;
 	    continue;
 	  } else if(piece <= Q_BCASTL) { // castling, encoded as (Q_XCASTL, king-to) + (rook, rook-to)
+	    int rook;
 	    piece = pieceList[piece]; // first two elements of pieceList contain King numbers
 	    from  = pieceList[piece]; // so this must be King
 	    quickBoard[from] = 0;
-	    quickBoard[to] = piece;
 	    pieceList[piece] = to;
-	    move++;
-	    continue;
+	    from = pieceList[(++move)->piece]; // for FRC this has to be done here
+	    quickBoard[from] = 0; // rook
+	    quickBoard[to] = piece;
+	    to = move->to; piece = move->piece;
+	    goto aftercastle;
 	  }
 	}
 	if(appData.searchMode > 2) counts[pieceType[quickBoard[to]]]--; // account capture
 	if((total -= (quickBoard[to] != 0)) < soughtTotal) return -1; // piece count dropped below what we search for
 	quickBoard[from] = 0;
+      aftercastle:
 	quickBoard[to] = piece;
 	pieceList[piece] = to;
 	cnt++; turn ^= 3;
@@ -11559,7 +11564,7 @@ QuickScan (Board board, Move *move)
 	    if(stretch++ == 0) for(i=0; i<EmptySquare; i++) lastCounts[i] = counts[i]; // remember actual material
 	} else stretch = 0;
 	if(stretch && (appData.searchMode == 1 || stretch >= appData.stretch)) return cnt + 1 - stretch;
-	move++;
+	move++; delayedKing = -1;
     } while(1);
 }
 
@@ -12143,7 +12148,7 @@ LoadGame (FILE *f, int gameNumber, char *title, int useList)
       AnalyzeFileEvent();
     }
 
-    if (!matchMode && pos >= 0) {
+    if (!matchMode && pos > 0) {
 	ToNrEvent(pos); // [HGM] no autoplay if selected on position
     } else
     if (matchMode || appData.timeDelay == 0) {