X-Git-Url: http://winboard.nl/cgi-bin?p=uci2wb.git;a=blobdiff_plain;f=UCI2WB.c;h=81a7e5fe62b75e8b8a1eae8b1807c2e733cfe550;hp=b901bbcbcba92bb1b9b6ae82c0a0b2a487756ade;hb=97e74bb8982f9fd78654a4f2b8a7619969a3414a;hpb=1788d5e3e95e8b959a382171f31da23cc10d5ee3

diff --git a/UCI2WB.c b/UCI2WB.c
index b901bbc..81a7e5f 100644
--- a/UCI2WB.c
+++ b/UCI2WB.c
@@ -160,9 +160,10 @@ StartSearch(char *ponder)
 }
 
 void
-StopPonder(int pondering)
+StopSearch(int discard)
 {
-	if(!pondering) return;
+	if(!searching) return;
+	if(discard) searching = 0; // this causes bestmove to be ignored
 	EPRINT((f, "# stop\n")) fflush(toE); // note: 'pondering' remains set until engine acknowledges 'stop' with 'bestmove'
 }
 
@@ -414,7 +415,7 @@ Move4Engine(char *m)
     }
 }
 
-int DoCommand ();
+void DoCommand ();
 char mySide;
 volatile char queue[10000], *qStart, *qEnd;
 
@@ -423,7 +424,7 @@ LaunchSearch()
 {
     int i;
 
-	if((computer == stm || computer == ANALYZE && !searching) && !suspended) {
+	if((computer == stm || computer == ANALYZE && !searching && sm != 1) && !suspended) {
 	    DPRINT("# start search\n");
 	    LoadPos(moveNr); fflush(stdout); // load position
 	    // and set engine thinking (note USI swaps colors!)
@@ -457,10 +458,13 @@ GUI2Engine()
 	else if(!strcmp(command, "offer")) drawOffer = 1; // backlogged anyway, so this can be done instantly
 	else if(!strcmp(command, "post"))  post = 1;
 	else if(!strcmp(command, "nopost"))post = 0;
+	else if(!strcmp(command, ".")) {
+	    printf("stat01: %d %d %d %d 100 %s\n", statTime, statNodes, statDepth, 100-currNr, currMove);
+	}
 	else if(!strcmp(command, "pause")) {
 	    if(computer == stm) myTime -= GetTickCount() - startTime;
 	    suspended = 1 + (searching == 1); // remember if we were pondering, and stop search ignoring bestmove
-	    if(searching) searching = 0, StopPonder(1);
+	    StopSearch(1);
 	}
 	else { //convert easy & hard to "option" after treating their effect on the adapter
 	  if(!strcmp(command, "easy")) {
@@ -493,7 +497,7 @@ GUI2Engine()
 		    EPRINT((f, "# ponderhit%s\n", draw)) fflush(toE); fflush(stdout);
 		    continue;
 		}
-		searching = 0; StopPonder(1);
+		StopSearch(1);
 	    }
 	    strcpy(move[moveNr++], command); // possibly overwrites ponder move
 	    *qEnd++ = '\n'; Sync(WAKEUP);    // make sure engine thread considers starting a search
@@ -505,8 +509,8 @@ GUI2Engine()
       {
 	if(searching == 3) { // command arrived during thinking; order abort for 'instant commands'
 	    if(!strcmp(command, "?") || !strcmp(command, "quit") ||
-	       !strcmp(command, "force") || !strcmp(command, "result")) StopPonder(1);
-	} else if(searching) searching = 0, StopPonder(1); // always abort pondering or analysis
+	       !strcmp(command, "force") || !strcmp(command, "result")) StopSearch(0);
+	} else StopSearch(1); // always abort pondering or analysis
 
 	// queue command for execution by engine thread
 	if(qStart == qEnd) qStart = qEnd = queue;
@@ -516,14 +520,14 @@ GUI2Engine()
     }
 }
 
-int
+void
 DoCommand ()
 {
     char line[1024], command[256], *p, *q, *r, type[99];
     int i;
 
     p=line; while(qStart < qEnd && (*p++ = *qStart++) != '\n') {} *p = 0;
-    if(line[0] == '\n') return 0;
+    if(line[0] == '\n') return;
     sscanf(line, "%s", command);
 
 	if(!strcmp(command, "new")) {
@@ -586,15 +590,10 @@ DoCommand ()
 	else if(!strcmp(command, "undo") && (i=1) || !strcmp(command, "remove") && (i=2)) {
 	    moveNr = moveNr > i ? moveNr - i : 0; collect = (computer == ANALYZE); sm = 0;
 	}
-	else if(!strcmp(command, ".")) {
-	    printf("stat01: %d %d %d %d 100 %s\n", statTime, statNodes, statDepth, 100-currNr, currMove);
-	    return 1;
-	}
 	else if(!strcmp(command+2, "clude") && collect > 2) { // include or exclude
 	    int all = !strcmp(line+8, "all"), in = command[1] == 'n';
 	    inex = 1; line[strlen(line)-1] = sm = 0; // strip LF and clear sm flag
 	    for(i=1; i<nr; i++) { if(!strcmp(line+8, moveMap[i]) || all) on[i] = in; sm |= on[i]+1; } // sm: 2 = enabled, 1 = disabled
-	    if(!(sm & 2)) return 1; // no moves enabled; continue current search
 	}
 	else if(!strcmp(command, "xboard")) ;
 	else if(!strcmp(command, "analyze"))computer = ANALYZE, collect = 1, sm = 0, Analyze("true");
@@ -618,8 +617,6 @@ DoCommand ()
 	    computer = NONE;
 	}
 	else if(!strcmp(command, "quit"))   { EPRINT((f, "# quit\n")) fflush(toE), exit(atoi(line+4)); }
-
-    return 0;
 }
 
 void *
@@ -630,7 +627,7 @@ Engine2GUI()
 	if(searching > 1) HandleEngineOutput();  // this could leave us (or fall through) pondering
 	while(qStart == qEnd && searching) HandleEngineOutput(); // relay ponder output until command arrives
 	Sync(PAUSE); // possibly wait for command silently if engine is idle
-	if(!DoCommand()) LaunchSearch();
+	DoCommand(); LaunchSearch();
     }
 }