X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=engineoutput.c;h=0a4e46ac404d26316df0ed38ebd7ced183e59686;hb=4d04bc8a6c2d5e410d519b25164613c5e5c2d160;hp=a21282e0fdffc5ad33fcd9a77410f50c74407b2e;hpb=56310c5b198bc521e0a715377c68378b7bcf10a5;p=xboard.git diff --git a/engineoutput.c b/engineoutput.c index a21282e..0a4e46a 100644 --- a/engineoutput.c +++ b/engineoutput.c @@ -76,20 +76,24 @@ static char header[MSG_SIZ]; #define MAX_VAR 400 static int scores[MAX_VAR], textEnd[MAX_VAR], curDepth[2], nrVariations[2]; +extern int initialRulePlies; + void MakeEngineOutputTitle() { static char buf[MSG_SIZ]; static char oldTitle[MSG_SIZ]; char *title = "Engine Output"; - extern int initialRulePlies; - int count; + int count, rule = 2*appData.ruleMoves; + + if(!EngineOutputIsUp()) return; // figure out value of 50-move counter count = currentMove; while( (signed char)boards[count][EP_STATUS] <= EP_NONE && count > backwardMostMove ) count--; if( count == backwardMostMove ) count -= initialRulePlies; - count += 2*appData.ruleMoves - currentMove; - snprintf(buf, MSG_SIZ, "%s (%d ply to draw)", title, count); - if(count <= 40) title = buf; + count = currentMove - count; + snprintf(buf, MSG_SIZ, "%s (%d reversible plies)", title, count); + if(!rule) rule = 100; + if(count >= rule - 40 && !appData.icsActive) title = buf; if(!strcmp(oldTitle, title)) return; safeStrCpy(oldTitle, title, MSG_SIZ); SetEngineOutputTitle(title); @@ -194,7 +198,7 @@ void SetProgramStats( FrontEndProgramStats * stats ) // now directly called by b header[0] = NULLCHAR; if(gameMode == AnalyzeMode && (multi = MultiPV(&first)) >= 0) { snprintf(header, MSG_SIZ, "\t%s viewpoint\t\tfewer / Multi-PV setting = %d / more\n", - appData.whitePOV ? "white" : "mover", first.option[multi].value); + appData.whitePOV || appData.scoreWhite ? "white" : "mover", first.option[multi].value); InsertIntoMemo( which, header, 0); } else if(appData.ponderNextMove && lastLine[which][0]) { @@ -481,7 +485,7 @@ static void UpdateControls( EngineOutputData * ed ) } /* Score */ - h = (gameMode == AnalyzeMode && appData.whitePOV && !WhiteOnMove(currentMove) ? -1 : 1) * ed->score; + h = ((gameMode == AnalyzeMode && appData.whitePOV || appData.scoreWhite) && !WhiteOnMove(currentMove) ? -1 : 1) * ed->score; if( h > 0 ) { snprintf( s_score, sizeof(s_score)/sizeof(s_score[0]), "+%.2f", h / 100.0 ); }