Allow escape sequences in telluser(error) messages

[xboard.git] / winboard / jaws.c

diff --git a/winboard/jaws.c b/winboard/jaws.c
index 4073abe..540bf7b 100644 (file)
--- a/winboard/jaws.c
+++ b/winboard/jaws.c
@@ -5,7 +5,7 @@
  * Massachusetts.\r
  *\r
  * Enhancements Copyright 1992-2001, 2002, 2003, 2004, 2005, 2006,\r
- * 2007, 2008, 2009 Free Software Foundation, Inc.\r
+ * 2007, 2008, 2009, 2010 Free Software Foundation, Inc.\r
  *\r
  * XBoard borrows its colors and the bitmaps.xchess bitmap set from XChess,\r
  * which was written and is copyrighted by Wayne Christopher.\r
@@ -947,7 +947,7 @@ SayMachineMove(int evenIfDuplicate)
                                    break;\r
                                }\r
                            }\r
-                           if(c != lastMover) return; // line is thinking output of future move, ignore.\r
+                           if(c != lastMover && !evenIfDuplicate) return; // line is thinking output of future move, ignore.\r
                            if(2*moveNr - (dotCount < 2) == previousMove)\r
                                return; // do not repeat same move; likely ponder output\r
                            sprintf(buf, "score %s %d at %d ply", \r
@@ -1180,11 +1180,11 @@ NiceTime(int x)
 }\r
 \r
 #define JAWS_ARGS \\r
-  { "beepOffBoard", ArgInt, (LPVOID) beeps, TRUE },\\r
-  { "beepEmpty", ArgInt, (LPVOID) (beeps+1), TRUE },\\r
-  { "beepWhite", ArgInt, (LPVOID) (beeps+2), TRUE },\\r
-  { "beepBlack", ArgInt, (LPVOID) (beeps+3), TRUE },\\r
-  { "beepHoldings", ArgInt, (LPVOID) (beeps+4), TRUE },\\r
+  { "beepOffBoard", ArgInt, (LPVOID) beeps, TRUE, (ArgIniType) 1 },\\r
+  { "beepEmpty", ArgInt, (LPVOID) (beeps+1), TRUE, (ArgIniType) 0 },\\r
+  { "beepWhite", ArgInt, (LPVOID) (beeps+2), TRUE, (ArgIniType) 0 },\\r
+  { "beepBlack", ArgInt, (LPVOID) (beeps+3), TRUE, (ArgIniType) 0 },\\r
+  { "beepHoldings", ArgInt, (LPVOID) (beeps+4), TRUE, (ArgIniType) 0 },\\r
 \r
 #define JAWS_ALT_INTERCEPT \\r
            if(suppressOneKey) {\\r