X-Git-Url: http://winboard.nl/cgi-bin?p=uci2wb.git;a=blobdiff_plain;f=UCI2WB.c;h=256150c9cb906fed65ebada84b6c50230cdf6e42;hp=fbd9d74c3fbe814ce5af7b5dc0d491ae01fe8be4;hb=99de6ab7fd6d624fbf821de5c2e42c1bbba6d914;hpb=c3f4db2a7ba3c54f806a5972cf371ab6af416be1

diff --git a/UCI2WB.c b/UCI2WB.c
index fbd9d74..256150c 100644
--- a/UCI2WB.c
+++ b/UCI2WB.c
@@ -109,6 +109,15 @@ LoadPos(int moveNr)
 	for(j=0; j<moveNr; j++) { fprintf(toE, " %s", move[j]); DPRINT(" %s", move[j]); }
 }
 
+void
+StartPonder()
+{
+	if(!move[moveNr][0]) return; // no ponder move
+	LoadPos(moveNr+1);
+	pondering = 1; lastDepth = 1;
+	StartSearch(" ponder");
+}
+
 char *Convert(char *pv)
 {   // convert Shogi coordinates to WB
     char *p, *q, c;
@@ -166,16 +175,13 @@ Engine2GUI()
 	    if(mps && ((moveNr+1)/2) % mps == 0) myTime += tc; if(sTime) myTime = sTime; // new session or move starts
 	    // first start a new ponder search, if pondering is on and we have a move to ponder on
 	    if(p = strstr(line+9, "ponder")) {
+	      sscanf(p+7, "%s", move[moveNr]);
 	      if(computer != NONE && ponder) {
-		sscanf(p+7, "%s", move[moveNr]);
 		DPRINT("# ponder on %s\n", move[moveNr]);
-		LoadPos(moveNr+1); // load position
-		// and set engine pondering
-		pondering = 1; lastDepth = 1;
-		StartSearch(" ponder");
+		StartPonder();
 	      }
 	      p[-1] = '\n'; *p = 0; // strip off ponder move
-	    }
+	    } else move[moveNr][0] = 0;
 	    Move4GUI(line+9);
 	    printf("move %s\n", line+9); // send move to GUI
 	    if(lastScore == 100001 && iniPos[0] != 'f') { printf("%s {mate}\n", stm == WHITE ? "1-0" : "0-1"); computer = NONE; }
@@ -299,7 +305,7 @@ GUI2Engine()
 	line[++i] = 0; if(x == EOF) { printf("# EOF\n"); exit(-1); }
 	sscanf(line, "%s", command);
 	if(!strcmp(command, "new")) {
-	    computer = BLACK; moveNr = 0; depth = -1;
+	    computer = BLACK; moveNr = 0; depth = -1; move[0][0] = 0;
 	    stm = WHITE; strcpy(iniPos, "position startpos");
 	    if(memory != oldMem && hasHash) fprintf(toE, "setoption name %s value %d\n", hashOpt, memory);
 	    oldMem = memory;
@@ -382,11 +388,7 @@ GUI2Engine()
 	    suspended = 1 + pondering, StopPonder(1); // remember if we were pondering, and stop search ignoring bestmove
 	}
 	else if(!strcmp(command, "resume")) {
-	    if(suspended == 2) { // restart interrupted ponder search
-		LoadPos(moveNr+1);
-	 	pondering = 1; lastDepth = 1;
-		StartSearch(" ponder");
-	    }
+	    if(suspended == 2) StartPonder(); // restart interrupted ponder search
 	    suspended = 0; // causes thinking to start in normal way if on move or analyzing
 	}
 	else if(!strcmp(command, "xboard")) ;
@@ -398,8 +400,8 @@ GUI2Engine()
 	else if(!strcmp(command, "otim"))   sscanf(line+4, "%d", &hisTime), hisTime *= 10;
 	else if(!strcmp(command, "post"))   post = 1;
 	else if(!strcmp(command, "nopost")) post = 0;
-	else if(!strcmp(command, "easy"))   ponder = 0;
-	else if(!strcmp(command, "hard"))   ponder = 1;
+	else if(!strcmp(command, "easy"))   ponder = 0, StopPonder(pondering);
+	else if(!strcmp(command, "hard"))   ponder = 1, StartPonder();
 	else if(!strcmp(command, "ping"))   pause = 1, fprintf(toE, "isready\n"), fflush(toE), Sync(PAUSE), printf("pong %s", line+5);
 	else if(!strcmp(command, "memory")) sscanf(line, "memory %d", &memory);
 	else if(!strcmp(command, "cores"))  sscanf(line, "cores %d", &cores);