X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=c6eedec7f5a35c86b2f0f6201094d286da9a29d1;hb=f4f20b290bc05bdd35be748a9282adcbdc582534;hp=b2f684ba147637b0d1bd41d40d642f546a516894;hpb=912ee1f95a49097bd2f3f0c00f25361aa0be2594;p=xboard.git

diff --git a/backend.c b/backend.c
index b2f684b..c6eedec 100755
--- a/backend.c
+++ b/backend.c
@@ -607,7 +607,7 @@ InitBackEnd1()
     ShowThinkingEvent(); // [HGM] thinking: make sure post/nopost state is set according to options
 
     GetTimeMark(&programStartTime);
-    srandom(programStartTime.ms); // [HGM] book: makes sure random is unpredictabe to msec level
+    srandom((programStartTime.ms + 1000*programStartTime.sec)*0x1001001); // [HGM] book: makes sure random is unpredictabe to msec level
 
     ClearProgramStats();
     programStats.ok_to_send = 1;
@@ -1977,7 +1977,7 @@ VariantSwitch(Board board, VariantClass newVariant)
      case VariantSuper:
        newHoldingsWidth = 2;
        gameInfo.holdingsSize = 8;
-       return;
+       break;
      case VariantGothic:
      case VariantCapablanca:
      case VariantCapaRandom:
@@ -3301,8 +3301,8 @@ read_from_ics(isr, closure, data, count, error)
                         white_holding[strlen(white_holding)-1] = NULLCHAR;
                         black_holding[strlen(black_holding)-1] = NULLCHAR;
                         /* [HGM] copy holdings to board holdings area */
-                        CopyHoldings(boards[currentMove], white_holding, WhitePawn);
-                        CopyHoldings(boards[currentMove], black_holding, BlackPawn);
+                        CopyHoldings(boards[forwardMostMove], white_holding, WhitePawn);
+                        CopyHoldings(boards[forwardMostMove], black_holding, BlackPawn);
 #if ZIPPY
 			if (appData.zippyPlay && first.initDone) {
 			    ZippyHoldings(white_holding, black_holding,
@@ -3720,15 +3720,6 @@ ParseBoard12(string)
     /* Update currentMove and known move number limits */
     newMove = newGame || moveNum > forwardMostMove;
 
-    /* [DM] If we found takebacks during icsEngineAnalyze try send to engine */
-    if (!newGame && appData.icsEngineAnalyze && moveNum < forwardMostMove) {
-        takeback = forwardMostMove - moveNum;
-        for (i = 0; i < takeback; i++) {
-             if (appData.debugMode) fprintf(debugFP, "take back move\n");
-             SendToProgram("undo\n", &first);
-        }
-    }
-
     if (newGame) {
 	forwardMostMove = backwardMostMove = currentMove = moveNum;
 	if (gameMode == IcsExamining && moveNum == 0) {
@@ -3741,6 +3732,20 @@ ParseBoard12(string)
 	}
     } else if (moveNum == forwardMostMove + 1 || moveNum == forwardMostMove
 	       || (moveNum < forwardMostMove && moveNum >= backwardMostMove)) {
+#if ZIPPY
+	/* [DM] If we found takebacks during icsEngineAnalyze try send to engine */
+	/* [HGM] applied this also to an engine that is silently watching        */
+	if (appData.zippyPlay && moveNum < forwardMostMove && first.initDone &&
+	    (gameMode == IcsObserving || gameMode == IcsExamining) &&
+	    gameInfo.variant == currentlyInitializedVariant) {
+	  takeback = forwardMostMove - moveNum;
+	  for (i = 0; i < takeback; i++) {
+	    if (appData.debugMode) fprintf(debugFP, "take back move\n");
+	    SendToProgram("undo\n", &first);
+	  }
+	}
+#endif
+
 	forwardMostMove = moveNum;
 	if (!pausing || currentMove > forwardMostMove)
 	  currentMove = forwardMostMove;
@@ -3751,12 +3756,20 @@ ParseBoard12(string)
 	    forwardMostMove = pauseExamForwardMostMove;
 	    return;
 	}
-	forwardMostMove = backwardMostMove = currentMove = moveNum;
 	if (gameMode == IcsExamining && moveNum > 0 && appData.getMoveList) {
+#if ZIPPY
+	    if(appData.zippyPlay && forwardMostMove > 0 && first.initDone) {
+		// [HGM] when we will receive the move list we now request, it will be
+		// fed to the engine from the first move on. So if the engine is not
+		// in the initial position now, bring it there.
+		InitChessProgram(&first, 0);
+	    }
+#endif
 	    ics_getting_history = H_REQUESTED;
 	    sprintf(str, "%smoves %d\n", ics_prefix, gamenum);
 	    SendToICS(str);
 	}
+	forwardMostMove = backwardMostMove = currentMove = moveNum;
     }
     
     /* Update the clocks */