X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=UCI2WB.c;h=7fd213063c528eb4ca59d570a8678aaacbe6fec3;hb=d7b4912c91352afe825b55def9eaa7ed2117299b;hp=8dcc73416ddf58169b925919a6029d3bf460200d;hpb=e5a0dfcb7ef1bd4450b235ce1405bc295a621036;p=uci2wb.git

diff --git a/UCI2WB.c b/UCI2WB.c
index 8dcc734..7fd2130 100644
--- a/UCI2WB.c
+++ b/UCI2WB.c
@@ -129,14 +129,13 @@ Play(int nr)
 void
 StartSearch(char *ponder)
 {	// send the 'go' command to engine. Suffix by ponder.
-	char *draw = "draw ";
 	int x = (ponder[0] != 0);                   // during ponder stm is the opponent
 	int black = (stm == BLACK ^ x ^ sc == 's'); // set if our color is what the engine calls black
 	int nr = moveNr + x;                        // we ponder for one move ahead!
-	if(sc == 'x') black = 1; else draw = "";    // in UCCI 'black' refers to us and 'white' to opponent
-	drawOffer = 0;
-	fprintf(toE, "\ngo%s %s%stime %d %stime %d", ponder, draw, bTime, black ? myTime : hisTime, wTime, !black ? myTime : hisTime);
-	DPRINT(    "\n# go%s %s%stime %d %stime %d", ponder, draw, bTime, black ? myTime : hisTime, wTime, !black ? myTime : hisTime);
+	if(sc == 'x') black = 1; else drawOffer = 0;// in UCCI 'black' refers to us and 'white' to opponent
+	if(!x && drawOffer) ponder = " draw", drawOffer = 0; //pass draw offer only when not pondering
+	fprintf(toE, "\ngo%s %stime %d %stime %d", ponder, bTime, black ? myTime : hisTime, wTime, !black ? myTime : hisTime);
+	DPRINT(    "\n# go%s %stime %d %stime %d", ponder, bTime, black ? myTime : hisTime, wTime, !black ? myTime : hisTime);
 	if(sTime > 0) { fprintf(toE, " movetime %d", sTime); DPRINT(" movetime %d", sTime); } else
 	if(mps) { fprintf(toE, " movestogo %d", mps*(nr/(2*mps)+1)-nr/2); DPRINT(" movestogo %d", mps*(nr/(2*mps)+1)-nr/2); }
 	if(inc && !suffix) { fprintf(toE, " %s %d %s %d", wInc, inc, bInc, inc); DPRINT(" %s %d %s %d", wInc, inc, bInc, inc); }
@@ -149,7 +148,7 @@ void
 StopPonder(int pondering)
 {
 	if(!pondering) return;
-	pause = 1;
+	pause = 2;
 	fprintf(toE, "stop\n"); fflush(toE); DPRINT("# stop\n"); // note: 'pondering' remains set until engine acknowledges 'stop' with 'bestmove'
 	Sync(PAUSE); // wait for engine to acknowledge 'stop' with 'bestmove'.
 }
@@ -238,8 +237,9 @@ Engine2GUI()
 	if(sscanf(line, "%s", command) != 1) continue;
 	if(!strcmp(command, "bestmove")) {
 	    if(pause) { pondering = pause = 0; Sync(WAKEUP); continue; } // bestmove was reply to ponder miss or analysis result; ignore.
+	    else if(pondering) { pondering = 0; printf("%d 0 0 0 UCI violation! Engine moves during ponder\n", lastDepth+1); continue; } // ignore ponder search
 	    // move was a move to be played
-	    if((p = strstr(line+8, " draw")) && p != line+8)   { *p = '\n'; printf("offer draw\n"); computer = NONE; } // UCCI
+	    if(p = strstr(line+8, " draw")) *p = 0, printf("offer draw\n"); // UCCI
 	    if(strstr(line+9, "resign")) { printf("resign\n"); computer = NONE; }
 	    if(strstr(line+9, "(none)") || strstr(line+9, "null") ||
 	       strstr(line+9, "0000")) { printf("%s\n", lastScore < -99999 ? "resign" : "1/2-1/2 {stalemate}"); computer = NONE; }
@@ -404,8 +404,9 @@ GUI2Engine()
 	    // when pondering we either continue the ponder search as normal search, or abort it
 	    if(pondering || computer == ANALYZE) {
 		if(pondering && !strcmp(command, move[moveNr])) { // ponder hit
+		    char *draw = drawOffer ? " draw" : ""; drawOffer = 0;
 		    pondering = 0; moveNr++; startTime = GetTickCount(); // clock starts running now
-		    fprintf(toE, "ponderhit\n"); DPRINT("# ponderhit\n");
+		    fprintf(toE, "ponderhit%s\n", draw); DPRINT("# ponderhit%s\n", draw);
 		    goto nomove;
 		}
 		StopPonder(1);