X-Git-Url: http://winboard.nl/cgi-bin?p=uci2wb.git;a=blobdiff_plain;f=UCI2WB.c;h=5118c224f6ac7c4ee8ab1b420ebb17c218f13143;hp=871527648fc5ef53504ce3ce2ddd25b424415feb;hb=2b385df82d70d44518a167befa41e71fbd65c652;hpb=42d1fe296f371b87c4e9520c71e534ffe5569c77

diff --git a/UCI2WB.c b/UCI2WB.c
index 8715276..5118c22 100644
--- a/UCI2WB.c
+++ b/UCI2WB.c
@@ -260,7 +260,7 @@ HandleEngineOutput()
 	    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; }
 	    sscanf(line, "bestmove %s", move[moveNr++]);
-	    myTime -= (GetTickCount() - startTime)*1.02 + inc; // update own clock, so we can give correct wtime, btime with ponder
+	    myTime -= (GetTickCount() - startTime)*1.02 - inc; // update own clock, so we can give correct wtime, btime with ponder
 	    if(mps && ((moveNr+1)/2) % mps == 0) myTime += tc; if(sTime) myTime = sTime; // new session or move starts
 	    stm = WHITE+BLACK - stm;
 	    // first start a new ponder search, if pondering is on and we have a move to ponder on
@@ -415,7 +415,7 @@ Move4Engine(char *m)
     }
 }
 
-int DoCommand ();
+void DoCommand ();
 char mySide;
 volatile char queue[10000], *qStart, *qEnd;
 
@@ -424,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!)
@@ -458,6 +458,9 @@ 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
@@ -517,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")) {
@@ -587,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");
@@ -619,8 +617,6 @@ DoCommand ()
 	    computer = NONE;
 	}
 	else if(!strcmp(command, "quit"))   { EPRINT((f, "# quit\n")) fflush(toE), exit(atoi(line+4)); }
-
-    return 0;
 }
 
 void *
@@ -631,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();
     }
 }