X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=045657cc00f8a3d343ee4e5d1f751b4ce2e704ac;hb=b7a79fc5f838b5553d9d48ac26afad1c21111e95;hp=94d0e81636bc74cf095f982544666f27693ae03b;hpb=18fc21bfe47cf80d294fffc22eb00d7f4384cd62;p=xboard.git

diff --git a/backend.c b/backend.c
index 94d0e81..045657c 100644
--- a/backend.c
+++ b/backend.c
@@ -469,6 +469,7 @@ char  FENepStatus;
 FILE  *serverMoves = NULL; // next two for broadcasting (/serverMoves option)
 int loadFlag = 0; 
 int shuffleOpenings;
+int mute; // mute all sounds
 
 ChessSquare  FIDEArray[2][BOARD_SIZE] = {
     { WhiteRook, WhiteKnight, WhiteBishop, WhiteQueen,
@@ -2093,6 +2094,7 @@ read_from_ics(isr, closure, data, count, error)
     int backup;    /* [DM] For zippy color lines */
     char *p;
     char talker[MSG_SIZ]; // [HGM] chat
+    int channel;
 
     if (appData.debugMode) {
       if (!error) {
@@ -2418,15 +2420,28 @@ read_from_ics(isr, closure, data, count, error)
 //if(appData.debugMode) fprintf(debugFP, "hunt for tell, buf = %s\n", buf+i);
 
 	    // [HGM] chat: intercept tells by users for which we have an open chat window
+	    channel = -1;
 	    if(started == STARTED_NONE && (looking_at(buf, &i, "* tells you:") || looking_at(buf, &i, "* says:") || 
-					   looking_at(buf, &i, "* whispers:"))) {
+					   looking_at(buf, &i, "* whispers:") ||
+					   looking_at(buf, &i, "*(*):") && (sscanf(star_match[1], "%d", &channel),1) ||
+					   looking_at(buf, &i, "*(*)(*):") && sscanf(star_match[2], "%d", &channel) == 1 )) {
 		int p;
 		sscanf(star_match[0], "%[^(]", talker+1); // strip (C) or (U) off ICS handle
 		chattingPartner = -1;
-		if(buf[i-3] == 'r') // whisper; look if there is a WHISPER chatbox
-		for(p=0; p<MAX_CHAT; p++) if(!strcmp("WHISPER", chatPartner[p])) {
+
+		if(channel >= 0) // channel broadcast; look if there is a chatbox for this channel
+		for(p=0; p<MAX_CHAT; p++) {
+		    if(channel == atoi(chatPartner[p])) {
 		    talker[0] = '['; strcat(talker, "]");
 		    chattingPartner = p; break;
+		    }
+		} else
+		if(buf[i-3] == 'r') // whisper; look if there is a WHISPER chatbox
+		for(p=0; p<MAX_CHAT; p++) {
+		    if(!strcmp("WHISPER", chatPartner[p])) {
+			talker[0] = '['; strcat(talker, "]");
+			chattingPartner = p; break;
+		    }
 		}
 		if(chattingPartner<0) // if not, look if there is a chatbox for this indivdual
 		for(p=0; p<MAX_CHAT; p++) if(!strcasecmp(talker+1, chatPartner[p])) {
@@ -5426,7 +5441,9 @@ UserMoveEvent(fromX, fromY, toX, toY, promoChar)
     */
     ChessMove moveType = UserMoveTest(fromX, fromY, toX, toY, promoChar);
 if(appData.debugMode) fprintf(debugFP, "moveType 4 = %d, promochar = %x\n", moveType, promoChar);
-    if(moveType != ImpossibleMove)
+    if(moveType == AmbiguousMove)
+	DrawPosition(FALSE, boards[currentMove]);
+    else if(moveType != ImpossibleMove)
         FinishMove(moveType, fromX, fromY, toX, toY, promoChar);
 }
 
@@ -7535,7 +7552,7 @@ void SendEgtPath(ChessProgramState *cps)
 		while(*r && *r != ',') r++; // path info is everything upto next ';' or end of string
 		c = *r; *r = 0;             // temporarily null-terminate path info
 		    *--q = 0;               // strip of trailig ':' from name
-		    sprintf(buf, "egtbpath %s %s\n", name+1, s);
+		    sprintf(buf, "egtpath %s %s\n", name+1, s);
 		*r = c;
 		SendToProgram(buf,cps);     // send egtbpath command for this format
 	    }
@@ -10526,6 +10543,7 @@ MachineWhiteEvent()
     SetMachineThinkingEnables();
     first.maybeThinking = TRUE;
     StartClocks();
+    firstMove = FALSE;
 
     if (appData.autoFlipView && !flipView) {
       flipView = !flipView;
@@ -12256,7 +12274,8 @@ ReceiveFromProgram(isr, closure, message, count, error)
 		   sscanf(message, "resign%c", &c)!=1 && sscanf(message, "feature %c", &c)!=1 &&
 		   sscanf(message, "error %c", &c)!=1 && sscanf(message, "illegal %c", &c)!=1 &&
 		   sscanf(message, "tell%c", &c)!=1   && sscanf(message, "0-1 %c", &c)!=1 &&
-		   sscanf(message, "1-0 %c", &c)!=1   && sscanf(message, "1/2-1/2 %c", &c)!=1 && start != '#')
+		   sscanf(message, "1-0 %c", &c)!=1   && sscanf(message, "1/2-1/2 %c", &c)!=1 &&
+		   sscanf(message, "pong %c", &c)!=1   && start != '#')
 			{ quote = "# "; print = (appData.engineComments == 2); }
 		message[0] = start; // restore original message
 	}