X-Git-Url: http://winboard.nl/cgi-bin?p=uci2wb.git;a=blobdiff_plain;f=UCI2WB.c;h=a546859dd163f22136537749a7e67af1dd90f12f;hp=ad897f5aa20cf13d4f144547c709cd802ad5f42f;hb=f21b77b0e872a89e1448cb56d5cff016f7231a12;hpb=3ec8885c5e09e26dc907693ff02adc6c46d7dc73

diff --git a/UCI2WB.c b/UCI2WB.c
index ad897f5..a546859 100644
--- a/UCI2WB.c
+++ b/UCI2WB.c
@@ -9,7 +9,7 @@
 /* of which you should have received a copy together with this file.        */
 /****************************************************************************/
 
-#define VERSION "3.0"
+#define VERSION "4.0"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -294,17 +294,6 @@ HandleEngineOutput()
 		}
 		continue;
 	    }
-	    if(collect && (pv = strstr(line+5, "currmove "))) {
-		if(p = strstr(line+5, "currmovenumber ")) {
-		    n = atoi(p+15);
-		    if(collect == 1 && n != 1) continue; // wait for move 1
-		    if(collect + (n == 1) > 2) { // done collecting
-			if(inex && collect == 2) printf("%d 0 0 0 OK to exclude\n", lastDepth);
-			collect = 3; continue;
-		    }
-		    collect = 2; on[nr=n] = 1; sscanf(pv+9, "%s", moveMap[n]); continue; // store move
-		}
-	    }
 	    if(!post) continue;
 	    if(sscanf(line+5, "string %c", &dummy) == 1) printf("%d 0 0 0 %s", lastDepth, line+12); else {
 		if(p = strstr(line+4, " depth "))      sscanf(p+7, "%d", &d), statDepth = d;
@@ -313,8 +302,6 @@ HandleEngineOutput()
 		if(p = strstr(line+4, " score "))      sscanf(p+7, "%d", &s), statScore = s;
 		if(p = strstr(line+4, " nodes "))      sscanf(p+7, "%d", &n), statNodes = n;
 		if(p = strstr(line+4, " time "))       sscanf(p+6, "%d", &t), t /= 10, statTime = t;
-		if(p = strstr(line+4, " currmove "))   sscanf(p+10,"%s", currMove);
-		if(p = strstr(line+4, " currmovenumber ")) sscanf(p+16,"%d", &currNr);
 		if(pv = strstr(line+4, " pv ")) { // convert PV info to WB thinking output
 		  if(d > maxDepth) maxDepth = d, mpvSP = 0; else if(d < maxDepth) continue; // ignore depth regressions
 		  if(p = strstr(line+4, " upperbound ")) strcat(p, "?\n"); else
@@ -324,6 +311,18 @@ HandleEngineOutput()
 		    printf("%3d  %6d %6d %10d %s", lastDepth=d, lastScore=s, t, n, Convert(pv+4));
 		} else if(s == -100000) lastScore = s; // when checkmated score is valid even without PV (which might not come)
 	    }
+	    if(collect && (pv = strstr(line+4, " currmove "))) {
+		sscanf(pv+10,"%s", currMove);
+		if(p = strstr(line+4, " currmovenumber ")) {
+		    n = currNr = atoi(p+16);
+		    if(collect == 1 && n != 1) continue; // wait for move 1
+		    if(collect + (n == 1) > 2) { // done collecting
+			if(inex && collect == 2) printf("%d 0 0 0 OK to exclude\n", lastDepth);
+			collect = 3; continue;
+		    }
+		    collect = 2; on[nr=n] = 1; strcpy(moveMap[n], currMove); continue; // store move
+		}
+	    }
 	}
 	else if(!strcmp(command, "option")) { // USI option: extract data fields
 	    char name[80], type[80], buf[1024], val[256], *q;
@@ -460,7 +459,7 @@ GUI2Engine()
 	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);
+	    printf("stat01: %d %d %d %d %d %s\n", statTime, statNodes, statDepth, nr-currNr, nr, currMove);
 	}
 	else if(!strcmp(command, "pause")) {
 	    if(computer == stm) myTime -= GetTickCount() - startTime;
@@ -468,8 +467,12 @@ GUI2Engine()
 	    StopSearch(1);
 	}
 	else if(!strcmp(command, "xboard")) ;
+	else if(!strcmp(command, "random")) ;
 	else if(!strcmp(command, "accepted")) ;
 	else if(!strcmp(command, "rejected")) ;
+	else if(!strcmp(command, "book")) ;
+	else if(!strcmp(command, "ics")) ;
+	else if(!strcmp(command, "hint")) ;
 	else if(!strcmp(command, "computer")) comp = 1;
 	else { //convert easy & hard to "option" after treating their effect on the adapter
 	  if(!strcmp(command, "easy")) {
@@ -542,10 +545,10 @@ DoCommand ()
 	    if(memory != oldMem && hasHash) EPRINT((f, "# setoption %s%s %s%d\n", nameWord, hashOpt, valueWord, memory))
 	    oldMem = memory;
 	    // we can set other options here
-	    if(sc == 'x') { if(newGame) EPRINT((f, "# setoption newgame\n")) } else // optional in UCCI
 	    if(varOpt) EPRINT((f, "# setoption name UCI_Variant value chess\n"))
 	    EPRINT((f, "# isready\n")) fflush(toE);
 	    HandleEngineOutput(); // wait for readyok
+	    if(sc == 'x') { if(newGame) EPRINT((f, "# setoption newgame\n")) } else // optional in UCCI
 	    EPRINT((f, "# u%cinewgame\n", sc)) fflush(toE);
 	}
 	else if(!strcmp(command, "option")) {
@@ -620,6 +623,7 @@ DoCommand ()
 	    computer = NONE;
 	}
 	else if(!strcmp(command, "quit"))   { EPRINT((f, "# quit\n")) fflush(toE), exit(atoi(line+4)); }
+	else printf("Error (unknown command): %s\n", command);
 
 	fflush(stdout);
 }