X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=UCI2WB.c;h=fbd9d74c3fbe814ce5af7b5dc0d491ae01fe8be4;hb=c3f4db2a7ba3c54f806a5972cf371ab6af416be1;hp=654c749fa3bfe7a515587f314ecffb7c202dac14;hpb=7ba87b6b2eceae92a147246af886d9cf19178057;p=uci2wb.git

diff --git a/UCI2WB.c b/UCI2WB.c
index 654c749..fbd9d74 100644
--- a/UCI2WB.c
+++ b/UCI2WB.c
@@ -1,6 +1,6 @@
 /************************* UCI2WB by H.G.Muller ****************************/
 
-#define VERSION "1.8"
+#define VERSION "1.10"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -30,7 +30,7 @@
 #define NONE  2
 #define ANALYZE 3
 
-char move[2000][10], checkOptions[8192], iniPos[256], hashOpt[20], pause, pondering, ponder, post, hasHash, c, sc='c', *suffix, *variants;
+char move[2000][10], checkOptions[8192], iniPos[256], hashOpt[20], pause, pondering, suspended, ponder, post, hasHash, c, sc='c', *suffix, *variants;
 int mps, tc, inc, sTime, depth, myTime, hisTime, stm, computer = NONE, memory, oldMem=0, cores, moveNr, lastDepth, lastScore, startTime, debug;
 int statDepth, statScore, statNodes, statTime, currNr, size, collect, nr, sm, inex, on[500]; char currMove[20], moveMap[500][10]; // for analyze mode
 
@@ -139,8 +139,6 @@ Move4GUI(char *m)
 	     m[4] = '=', m[5] = 0;
       }
     }
-    if(m[0] == 'e' && (m[5] == 'a' || m[5] == 'h')) // seirawan castling + gating at Rook
-	m[0] = m[5], m[2] = 'e'; // convert to RxK notation
 }
 
 void *
@@ -268,12 +266,7 @@ Move4Engine(char *m)
       m[2] = 'a'+'0'+size - m[2];
       m[3] = 'a'+'0'+size - m[3];
       if(m[4] == '=') m[4] = 0; // no '=' in USI format!
-      else if(m[4] != '\n') m[4] = '+'; // cater to WB 4.4 bug :-(
-    }
-    if(m[4] && (m[1] == '1' || m[1] == '8')) { // seirawan gating
-	m[5] = m[0], m[6] = m[1], m[7] = '\0'; // copy from-square behind it, as gating square
-	if(m[2] == 'e' && (m[0] == 'a' || m[0] == 'h'))
-	    m[2] = (m[0]+m[2]+1)>>1, m[0] = 'e'; // gating at Rook
+      else if(m[4]) m[4] = '+'; // cater to WB 4.4 bug :-(
     }
 }
 
@@ -285,7 +278,7 @@ GUI2Engine()
     while(1) {
 	int i, x;
 
-	if(computer == stm || computer == ANALYZE) {
+	if((computer == stm || computer == ANALYZE) && !suspended) {
 	    DPRINT("# start search\n");
 	    LoadPos(moveNr); // load position
 	    // and set engine thinking (note USI swaps colors!)
@@ -348,7 +341,7 @@ GUI2Engine()
 	}
 	else if(!strcmp(command, "protover")) {
 	    if(!variants) variants = sc=='s' ? "shogi,5x5+5_shogi" : VARIANTS;
-	    printf("feature variants=\"%s\" setboard=1 usermove=1 debug=1 ping=1 reuse=0 exclude=1 done=0\n", variants);
+	    printf("feature variants=\"%s\" setboard=1 usermove=1 debug=1 ping=1 reuse=0 exclude=1 pause=1 done=0\n", variants);
 	    printf("feature option=\"UCI2WB debug output -check %d\"\n", debug);
 	    fprintf(toE, "u%ci\n", sc); fflush(toE); // this prompts UCI engine for options
 	    Sync(PAUSE); // wait for uciok
@@ -384,6 +377,18 @@ GUI2Engine()
 	    if(!(sm & 2)) goto nomove; // no moves enabled; continue current search
 	    if(computer == ANALYZE) StopPonder(1); // abort old analysis
 	}
+	else if(!strcmp(command, "pause")) {
+	    if(computer == stm) myTime -= GetTickCount() - startTime;
+	    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");
+	    }
+	    suspended = 0; // causes thinking to start in normal way if on move or analyzing
+	}
 	else if(!strcmp(command, "xboard")) ;
 	else if(!strcmp(command, "analyze"))computer = ANALYZE, collect = 1, sm = 0;
 	else if(!strcmp(command, "exit"))   computer = NONE, StopPonder(1);