X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=7f8bc87a5669d50bf13a957d991b5772dc3cd443;hb=58b79b90c17a718bdbc2176f20d4bc89adccebc9;hp=9b81c39d71b59c4b0a684e884586e32ec35f06bb;hpb=a360a8beeeff933c8517413eace57a144362df65;p=xboard.git

diff --git a/backend.c b/backend.c
index 9b81c39..7f8bc87 100644
--- a/backend.c
+++ b/backend.c
@@ -996,6 +996,7 @@ Load (ChessProgramState *cps, int i)
 	SwapEngines(i);
 	ReplaceEngine(cps, i);
 	FloatToFront(&appData.recentEngineList, engineLine);
+	if(gameMode == BeginningOfGame) Reset(TRUE, TRUE);
 	return;
     }
     p = engineName;
@@ -1743,6 +1744,11 @@ InitBackEnd3 P((void))
                 CopyBoard(filePosition, boards[0]);
                 CopyBoard(initialPosition, boards[0]);
             }
+	} else if(*appData.fen != NULLCHAR) {
+	    if(ParseFEN(filePosition, &blackPlaysFirst, appData.fen, TRUE) && !blackPlaysFirst) {
+                startedFromPositionFile = TRUE;
+		Reset(TRUE, TRUE);
+	    }
 	}
 	if (initialMode == AnalyzeMode) {
 	  if (appData.noChessProgram) {
@@ -6454,6 +6460,7 @@ InitPosition (int redraw)
           initialRights[i] = filePosition[CASTLING][i];
       startedFromSetupPosition = TRUE;
     }
+    if(*appData.men) LoadPieceDesc(appData.men);
 
     CopyBoard(boards[0], initialPosition);
 
@@ -8050,6 +8057,9 @@ SendProgramStatsToFrontend (ChessProgramState * cps, ChessProgramStats * cpstats
 
     if(stats.pv && stats.pv[0]) safeStrCpy(lastPV[stats.which], stats.pv, sizeof(lastPV[stats.which])/sizeof(lastPV[stats.which][0])); // [HGM] pv: remember last PV of each
 
+    if( gameMode == AnalyzeMode && stats.pv && stats.pv[0]
+        && appData.analysisBell && stats.time >= 100*appData.analysisBell ) RingBell();
+
     SetProgramStats( &stats );
 }
 
@@ -8942,7 +8952,7 @@ FakeBookMove: // [HGM] book: we jump here to simulate machine moves after book h
         }
         if(appData.epd) {
            if(solvingTime >= 0) {
-              snprintf(buf1, MSG_SIZ, "%d. %4.2fs\n", matchGame, solvingTime/100.);
+              snprintf(buf1, MSG_SIZ, "%d. solved %4.2fs\n", matchGame, solvingTime/100.);
               totalTime += solvingTime; first.matchWins++;
            } else {
               snprintf(buf1, MSG_SIZ, "%d. wrong (%s)\n", matchGame, parseList[backwardMostMove]);
@@ -10783,6 +10793,7 @@ InitChessProgram (ChessProgramState *cps, int setup)
 
       b = SupportedVariant(cps->variants, gameInfo.variant, gameInfo.boardWidth,
                            gameInfo.boardHeight, gameInfo.holdingsSize, cps->protocolVersion, cps->tidy);
+
       if (b == NULL) {
 	VariantClass v;
 	char c, *q = cps->variants, *p = strchr(q, ',');
@@ -11418,6 +11429,11 @@ NextMatchGame ()
     res = LoadGameOrPosition(matchGame); // setup game
     appData.noChessProgram = FALSE; // LoadGameOrPosition might call Reset too!
     if(!res) return; // abort when bad game/pos file
+    if(appData.epd) {// in EPD mode we make sure first engine is to move
+	firstWhite = !(forwardMostMove & 1);
+	first.twoMachinesColor =  firstWhite ? "white\n" : "black\n";   // perform actual color assignement
+	second.twoMachinesColor = firstWhite ? "black\n" : "white\n";
+    }
     TwoMachinesEvent();
 }
 
@@ -11965,7 +11981,10 @@ Reset (int redraw, int init)
     lastHint[0] = NULLCHAR;
     ClearGameInfo(&gameInfo);
     gameInfo.variant = StringToVariant(appData.variant);
-    if(gameInfo.variant == VariantNormal && strcmp(appData.variant, "normal")) gameInfo.variant = VariantUnknown;
+    if(gameInfo.variant == VariantNormal && strcmp(appData.variant, "normal")) {
+	gameInfo.variant = VariantUnknown;
+	strncpy(engineVariant, appData.variant, MSG_SIZ);
+    }
     ics_user_moved = ics_clock_paused = FALSE;
     ics_getting_history = H_FALSE;
     ics_gamenum = -1;
@@ -12097,21 +12116,17 @@ AutoPlayOneMove ()
 	    SetHighlights(-1, -1, toX, toY);
 	}
     } else {
-        int viaX = moveList[currentMove][5] - AAA;
-        int viaY = moveList[currentMove][6] - ONE;
         fromX = moveList[currentMove][0] - AAA;
         fromY = moveList[currentMove][1] - ONE;
 
         HistorySet(parseList, backwardMostMove, forwardMostMove, currentMove); /* [AS] */
 
         if(moveList[currentMove][4] == ';') { // multi-leg
-            ChessSquare piece = boards[currentMove][viaY][viaX];
-	    AnimateMove(boards[currentMove], fromX, fromY, viaX, viaY);
-            boards[currentMove][viaY][viaX] = boards[currentMove][fromY][fromX];
-            AnimateMove(boards[currentMove], fromX=viaX, fromY=viaY, toX, toY);
-            boards[currentMove][viaY][viaX] = piece;
-        } else
+            killX = moveList[currentMove][5] - AAA;
+            killY = moveList[currentMove][6] - ONE;
+        }
 	AnimateMove(boards[currentMove], fromX, fromY, toX, toY);
+	killX = killY = -1;
 
 	if (appData.highlightLastMove) {
 	    SetHighlights(fromX, fromY, toX, toY);
@@ -12932,7 +12947,7 @@ LoadGame (FILE *f, int gameNumber, char *title, int useList)
     char buf[MSG_SIZ];
     int gn = gameNumber;
     ListGame *lg = NULL;
-    int numPGNTags = 0;
+    int numPGNTags = 0, i;
     int err, pos = -1;
     GameMode oldGameMode;
     VariantClass v, oldVariant = gameInfo.variant; /* [HGM] PGNvariant */
@@ -13121,6 +13136,8 @@ LoadGame (FILE *f, int gameNumber, char *title, int useList)
     if (appData.debugMode)
       fprintf(debugFP, "Parsed game start '%s' (%d)\n", yy_text, (int) cm);
 
+    for(i=0; i<EmptySquare; i++) { FREE(pieceDesc[i]); pieceDesc[i] = NULL; } // reset VariantMen
+
     if (cm == XBoardGame) {
 	/* Skip any header junk before position diagram and/or move 1 */
 	for (;;) {
@@ -13514,8 +13531,8 @@ LoadPosition (FILE *f, int positionNumber, char *title)
 	    DisplayError(_("Bad FEN position in file"), 0);
 	    return FALSE;
 	}
-	if((p = strstr(line, ";")) && (p = strstr(p+1, "bm "))) { // EPD with best move
-	    sscanf(p+3, "%s", bestMove);
+	if((strchr(line, ';')) && (p = strstr(line, " bm "))) { // EPD with best move
+	    sscanf(p+4, "%s", bestMove);
 	} else *bestMove = NULLCHAR;
     } else {
 	(void) fgets(line, MSG_SIZ, f);
@@ -15868,19 +15885,15 @@ ForwardInner (int target)
 		SetHighlights(-1, -1, toX, toY);
 	    }
 	} else {
-            int viaX = moveList[target - 1][5] - AAA;
-            int viaY = moveList[target - 1][6] - ONE;
             fromX = moveList[target - 1][0] - AAA;
             fromY = moveList[target - 1][1] - ONE;
 	    if (target == currentMove + 1) {
 		if(moveList[target - 1][4] == ';') { // multi-leg
-		    ChessSquare piece = boards[currentMove][viaY][viaX];
-		    AnimateMove(boards[currentMove], fromX, fromY, viaX, viaY);
-		    boards[currentMove][viaY][viaX] = boards[currentMove][fromY][fromX];
-		    AnimateMove(boards[currentMove], viaX, viaY, toX, toY);
-		    boards[currentMove][viaY][viaX] = piece;
-		} else
+		    killX = moveList[target - 1][5] - AAA;
+		    killY = moveList[target - 1][6] - ONE;
+		}
 		AnimateMove(boards[currentMove], fromX, fromY, toX, toY);
+		killX = killY = -1;
 	    }
 	    if (appData.highlightLastMove) {
 		SetHighlights(fromX, fromY, toX, toY);