From: H.G. Muller <h.g.muller@hccnet.nl>
Date: Sun, 24 Jan 2010 18:09:45 +0000 (+0100)
Subject: Use FICS atomic draw claim for sending move in zippy mode
X-Git-Tag: master-20100206~24
X-Git-Url: http://winboard.nl/cgi-bin?a=commitdiff_plain;h=37948ed62b289c847349f54d3100ac4a223c7d35;p=xboard.git

Use FICS atomic draw claim for sending move in zippy mode

For this the relaying of the move had to be moved until after the
adjudication, which again has to be done after MakeMove(), which is a
bit dubious, as MakeMove might take significant time when animating.
---

diff --git a/backend.c b/backend.c
index d8c5410..3a36a30 100644
--- a/backend.c
+++ b/backend.c
@@ -6553,26 +6553,6 @@ FakeBookMove: // [HGM] book: we jump here to simulate machine moves after book h
 	if (cps->sendTime == 2) cps->sendTime = 1;
 	if (cps->offeredDraw) cps->offeredDraw--;
 
-#if ZIPPY
-	if ((gameMode == IcsPlayingWhite || gameMode == IcsPlayingBlack) &&
-	    first.initDone) {
-	  SendMoveToICS(moveType, fromX, fromY, toX, toY);
-	  ics_user_moved = 1;
-	  if(appData.autoKibitz && !appData.icsEngineAnalyze ) { /* [HGM] kibitz: send most-recent PV info to ICS */
-		char buf[3*MSG_SIZ];
-
-		sprintf(buf, "kibitz !!! %+.2f/%d (%.2f sec, %u nodes, %.0f knps) PV=%s\n",
-			programStats.score / 100.,
-			programStats.depth,
-			programStats.time / 100.,
-			(unsigned int)programStats.nodes,
-			(unsigned int)programStats.nodes / (10*abs(programStats.time) + 1.),
-			programStats.movelist);
-		SendToICS(buf);
-if(appData.debugMode) fprintf(debugFP, "nodes = %d, %lld\n", (int) programStats.nodes, programStats.nodes);
-	  }
-	}
-#endif
 	/* currentMoveString is set as a side-effect of ParseOneMove */
 	strcpy(machineMove, currentMoveString);
 	strcat(machineMove, "\n");
@@ -6619,6 +6599,32 @@ if(appData.debugMode) fprintf(debugFP, "nodes = %d, %lld\n", (int) programStats.
 
 	if(Adjudicate(cps)) return; // [HGM] adjudicate: for all automatic game ends
 
+#if ZIPPY
+	if ((gameMode == IcsPlayingWhite || gameMode == IcsPlayingBlack) &&
+	    first.initDone) {
+	  if(cps->offeredDraw && (signed char)boards[forwardMostMove][EP_STATUS] <= EP_DRAWS) {
+		SendToICS(ics_prefix); // [HGM] drawclaim: send caim and move on one line for FICS
+		SendToICS("draw ");
+		SendMoveToICS(moveType, fromX, fromY, toX, toY);
+	  }
+	  SendMoveToICS(moveType, fromX, fromY, toX, toY);
+	  ics_user_moved = 1;
+	  if(appData.autoKibitz && !appData.icsEngineAnalyze ) { /* [HGM] kibitz: send most-recent PV info to ICS */
+		char buf[3*MSG_SIZ];
+
+		sprintf(buf, "kibitz !!! %+.2f/%d (%.2f sec, %u nodes, %.0f knps) PV=%s\n",
+			programStats.score / 100.,
+			programStats.depth,
+			programStats.time / 100.,
+			(unsigned int)programStats.nodes,
+			(unsigned int)programStats.nodes / (10*abs(programStats.time) + 1.),
+			programStats.movelist);
+		SendToICS(buf);
+if(appData.debugMode) fprintf(debugFP, "nodes = %d, %lld\n", (int) programStats.nodes, programStats.nodes);
+	  }
+	}
+#endif
+
 	bookHit = NULL;
 	if (gameMode == TwoMachinesPlay) {
             /* [HGM] relaying draw offers moved to after reception of move */