X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=zippy.c;h=917000032cb8612d4eb9c2e36acdfe7c2d9b51b2;hb=fa76217dec3666d46e537483a60ea7b9e9568e33;hp=c788318c777ded1ac1f83b9d499323f39f45d6a9;hpb=0efdc4c5ef60cf4c15e9dddf3658d2115e4d5d93;p=xboard.git

diff --git a/zippy.c b/zippy.c
index c788318..9170000 100644
--- a/zippy.c
+++ b/zippy.c
@@ -88,11 +88,16 @@ extern char *getenv();
 #include "backend.h"
 #include "backendz.h"
 
+char *SendMoveToBookUser P((int nr, ChessProgramState *cps, int initial)); // [HGM] book
+
 static char zippyPartner[MSG_SIZ];
 static char zippyLastOpp[MSG_SIZ];
 static int zippyConsecGames;
 static time_t zippyLastGameEnd;
 
+extern void mysrandom(unsigned int seed);
+extern int myrandom(void);
+
 void ZippyInit()
 {
     char *p;
@@ -227,7 +232,8 @@ char *swifties[] = {
     "i enthuses:", "i entreats:", "i enunciates:", "i eulogizes:",
     "i exclaims:", "i execrates:", "i exhorts:", "i expatiates:",
     "i explains:", "i explicates:", "i explodes:", "i exposes:",
-    "i exposits:", "i expounds:", "i expresses:", "i extols:",
+    "i exposits:", "i expostulates: ",
+    "i expounds:", "i expresses:", "i extols:",
     "i exults:", "i fantasizes:", "i fibs:", "i filibusters:",
     "i flatters:", "i flutes:", "i fools:", "i free-associates:",
     "i fulminates:", "i gabbles:", "i gabs:", "i gasps:",
@@ -779,6 +785,9 @@ void ZippyHandleChallenge(srated, swild, sbase, sincrement, opponent)
     base = atoi(sbase);
     increment = atoi(sincrement);
 
+    /* [DM] If icsAnalyzeEngine active we don't accept automatic games */
+    if (appData.icsActive && appData.icsEngineAnalyze) return;
+
     /* If desired, you can insert more code here to decline matches
        based on rated, variant, base, and increment, but it is
        easier to use the ICS formula feature instead. */
@@ -873,7 +882,10 @@ int ZippyMatch(buf, i)
     if (looking_at(buf, i, "Challenge: * (*) *(*) * * * * Loaded from *")) {
 	/* note: star_match[2] can include "[white] " or "[black] "
 	   before our own name. */
-	ZippyHandleChallenge(star_match[4], star_match[8],
+	if(star_match[8] == NULL || star_match[8][0] == 0) // [HGM] chessd: open-source ICS has file on next line
+	     ZippyHandleChallenge(star_match[4], star_match[5],
+			     star_match[6], star_match[7],			     StripHighlightAndTitle(star_match[0]));
+	else ZippyHandleChallenge(star_match[4], star_match[8],
 			     star_match[6], star_match[7],
 			     StripHighlightAndTitle(star_match[0]));
 	return TRUE;
@@ -909,11 +921,20 @@ int ZippyMatch(buf, i)
 	return TRUE;
     }
 
-    if (looking_at(buf, i, "offers you a draw")) {
-        if (first.sendDrawOffers && first.initDone) {
-	    SendToProgram("draw\n", &first);
-	}
-	return TRUE;
+
+    if (ics_type == ICS_ICC) { // [DM]
+        if (looking_at(buf, i, "Your opponent offers you a draw")) {
+            if (first.sendDrawOffers && first.initDone)
+                SendToProgram("draw\n", &first);
+            return TRUE;
+        }
+    } else {
+        if (looking_at(buf, i, "offers you a draw")) {
+            if (first.sendDrawOffers && first.initDone) {
+                SendToProgram("draw\n", &first);
+            }
+            return TRUE;
+        }
     }
 
     if (looking_at(buf, i, "requests that the game be aborted") ||
@@ -961,6 +982,7 @@ void ZippyFirstBoard(moveNum, basetime, increment)
     int w, b;
     char *opp = (gameMode==IcsPlayingWhite ? gameInfo.black : gameInfo.white);
     Boolean sentPos = FALSE;
+    char *bookHit = NULL; // [HGM] book
 
     if (!first.initDone) {
       /* Game is starting prematurely.  We can't deal with this */
@@ -1031,7 +1053,7 @@ void ZippyFirstBoard(moveNum, basetime, increment)
 		  SendTimeRemaining(&first, TRUE);
 		}
 	      }
-	      SendToProgram("go\n", &first);
+	      bookHit = SendMoveToBookUser(forwardMostMove-1, &first, TRUE); // [HGM] book: send go or retrieve book move
 	    } else {
 	        /* Engine's opponent is on move now */
 	        if (first.usePlayother) {
@@ -1057,7 +1079,8 @@ void ZippyFirstBoard(moveNum, basetime, increment)
 		  SendTimeRemaining(&first, TRUE);
 		}
 	      }
-	      SendToProgram("go\n", &first);
+//	      SendToProgram("go\n", &first);
+	      bookHit = SendMoveToBookUser(forwardMostMove-1, &first, TRUE); // [HGM] book: send go or retrieve book move
 	    }
 	}
     } else if (gameMode == IcsPlayingBlack) {
@@ -1081,7 +1104,8 @@ void ZippyFirstBoard(moveNum, basetime, increment)
 		  SendTimeRemaining(&first, FALSE);
 		}
 	      }
-	      SendToProgram("go\n", &first);
+//	      SendToProgram("go\n", &first);
+	      bookHit = SendMoveToBookUser(forwardMostMove-1, &first, TRUE); // [HGM] book: send go or retrieve book move
 	    } else {
 	        /* Engine's opponent is on move now */
 	        if (first.usePlayother) {
@@ -1099,6 +1123,18 @@ void ZippyFirstBoard(moveNum, basetime, increment)
 	    /* Nothing needs to be done here */
 	}	
     }
+
+    if(bookHit) { // [HGM] book: simulate book reply
+	static char bookMove[MSG_SIZ]; // a bit generous?
+
+	programStats.depth = programStats.nodes = programStats.time = 
+	programStats.score = programStats.got_only_move = 0;
+	sprintf(programStats.movelist, "%s (xbook)", bookHit);
+
+	strcpy(bookMove, "move ");
+	strcat(bookMove, bookHit);
+	HandleMachineMove(bookMove, &first);
+    }
 }