X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=618012f7210aa57e5203f549d3abeeb4625df0bd;hb=6bb8c7c57851a7cf4ed99dea5023e747c9d2adb9;hp=9689ab905398bbf0fff6e765a7abbfb0cd598dbe;hpb=49c9da5bc1862cec7b58f8647e98d3301e16ba02;p=xboard.git

diff --git a/backend.c b/backend.c
index 9689ab9..618012f 100644
--- a/backend.c
+++ b/backend.c
@@ -8436,6 +8436,7 @@ if(appData.debugMode) fprintf(debugFP, "nodes = %d, %lld\n", (int) programStats.
       if(appData.icsActive || forwardMostMove != 0 || cps != &first) return;
       if(sscanf(message, "setup (%s", buf) == 1) s = 8 + strlen(buf), buf[s-9] = NULLCHAR, SetCharTable(pieceToChar, buf);
       if(startedFromSetupPosition) return;
+      if(sscanf(message+s, "%dx%d+%d", &dummy, &dummy, &dummy) == 3) while(message[s] && message[s++] != ' '); // for compatibility with Alien Edition
       ParseFEN(boards[0], &dummy, message+s);
       DrawPosition(TRUE, boards[0]);
       startedFromSetupPosition = TRUE;
@@ -10132,7 +10133,7 @@ WriteTourneyFile (char *results, FILE *f)
 	fprintf(f, "-loadPositionIndex %d\n", appData.loadPositionIndex);
 	fprintf(f, "-rewindIndex %d\n", appData.rewindIndex);
 	fprintf(f, "-usePolyglotBook %s\n", appData.usePolyglotBook ? "true" : "false");
-	fprintf(f, "-polyglotBook %s\n", appData.polyglotBook);
+	fprintf(f, "-polyglotBook \"%s\"\n", appData.polyglotBook);
 	fprintf(f, "-bookDepth %d\n", appData.bookDepth);
 	fprintf(f, "-bookVariation %d\n", appData.bookStrength);
 	fprintf(f, "-discourageOwnBooks %s\n", appData.defNoBook ? "true" : "false");
@@ -11193,7 +11194,7 @@ AutoPlayOneMove ()
     if (currentMove >= forwardMostMove) {
       if(gameMode == AnalyzeFile) {
 	  if(appData.loadGameIndex == -1) {
-	    GameEnds(EndOfFile, NULL, GE_FILE);
+	    GameEnds(gameInfo.result, gameInfo.resultDetails ? gameInfo.resultDetails : "", GE_FILE);
           ScheduleDelayedEvent(AnalyzeNextGame, 10);
 	  } else {
           ExitAnalyzeMode(); SendToProgram("force\n", &first);
@@ -12043,7 +12044,7 @@ LoadGame (FILE *f, int gameNumber, char *title, int useList)
 	    gn = 1;
 	}
 	else {
-	    if(gameMode == AnalyzeFile && appData.loadGameIndex == -1)
+	    if(oldGameMode == AnalyzeFile && appData.loadGameIndex == -1)
 	      appData.loadGameIndex = 0; // [HGM] suppress error message if we reach file end after auto-stepping analysis
 	    else
 	    DisplayError(_("Game number out of range"), 0);
@@ -12439,10 +12440,12 @@ LoadGame (FILE *f, int gameNumber, char *title, int useList)
 
     HistorySet(parseList, backwardMostMove, forwardMostMove, currentMove-1);
 
-    if (oldGameMode == AnalyzeFile ||
-	oldGameMode == AnalyzeMode) {
+    if (oldGameMode == AnalyzeFile) {
       appData.loadGameIndex = -1; // [HGM] order auto-stepping through games
       AnalyzeFileEvent();
+    } else
+    if (oldGameMode == AnalyzeMode) {
+      AnalyzeFileEvent();
     }
 
     if(creatingBook) return TRUE;
@@ -15590,8 +15593,11 @@ GetInfoFromComment (int index, char * text)
         int time = -1, sec = 0, deci;
         char * s_eval = FindStr( text, "[%eval " );
         char * s_emt = FindStr( text, "[%emt " );
-
+#if 0
         if( s_eval != NULL || s_emt != NULL ) {
+#else
+        if(0) { // [HGM] this code is not finished, and could actually be detrimental
+#endif
             /* New style */
             char delim;
 
@@ -15644,7 +15650,7 @@ GetInfoFromComment (int index, char * text)
             if(sec >= 0) time = 600*time + 10*sec; else
             if(deci >= 0) time = 10*time + deci; else time *= 10; // deci-sec
 
-            score = score >= 0 ? score*100 + score_lo : score*100 - score_lo;
+            score = score > 0 || !score & p[1] != '-' ? score*100 + score_lo : score*100 - score_lo;
 
             /* [HGM] PV time: now locate end of PV info */
             while( *++sep >= '0' && *sep <= '9'); // strip depth