X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=dialogs.c;h=84ac4465ca845a9172cffba14626af16ac916b83;hb=95244a1c40718e9ad8bda9e2df66677e180354d6;hp=fa481d31c63982946d696e49b9a836288def3223;hpb=4a9ee0ca141c56ad69d68a93b8cce7799a040de5;p=xboard.git

diff --git a/dialogs.c b/dialogs.c
index fa481d3..84ac446 100644
--- a/dialogs.c
+++ b/dialogs.c
@@ -546,7 +546,7 @@ Pick (int n)
 	}
 
 	gameInfo.variant = v;
-	appData.variant = VariantName(v);
+	ASSIGN(appData.variant, VariantName(v));
 
 	shuffleOpenings = FALSE; /* [HGM] shuffle: possible shuffle reset when we switch */
 	startedFromPositionFile = FALSE; /* [HGM] loadPos: no longer valid in new variant */
@@ -555,9 +555,9 @@ Pick (int n)
 	appData.NrFiles = filesTmp;
 	appData.holdingsSize = sizeTmp;
 	appData.pieceToCharTable = NULL;
-	appData.pieceNickNames = "";
-	appData.colorNickNames = "";
-	appData.men = "";
+	ASSIGN(appData.pieceNickNames, "");
+	ASSIGN(appData.colorNickNames, "");
+	ASSIGN(appData.men, "");
         PopDown(TransientDlg);
 	Reset(True, True);
         return;
@@ -1607,10 +1607,10 @@ static Option shuffleOptions[] = {
 static void
 SetRandom (int n)
 {
-    int r = n==2 ? -1 : random() & (1<<30)-1;
+    int r = n==3 ? -1 : random() & (1<<30)-1;
     char buf[MSG_SIZ];
     snprintf(buf, MSG_SIZ,  "%d", r);
-    SetWidgetText(&shuffleOptions[1], buf, TransientDlg);
+    SetWidgetText(&shuffleOptions[2], buf, TransientDlg);
     SetWidgetState(&shuffleOptions[0], True);
 }
 
@@ -2120,6 +2120,10 @@ void
 ConsoleWrite(char *message, int count)
 {
     if(shellUp[ChatDlg] && chatOptions[CHAT_ICS].type != Skip) { // in Xaw this is a no-op
+	if(*message == 7) {
+	    message++; // remove bell
+	    if(strcmp(message, "\n")) return;
+	}
 	AppendColorized(&chatOptions[CHAT_ICS], message, count);
 	SetInsertPos(&chatOptions[CHAT_ICS], 999999);
     }
@@ -2472,9 +2476,10 @@ GetHelpText (FILE *f, char *name)
 {
     char *line, buf[MSG_SIZ], title[MSG_SIZ], text[10000], *p = text, *q = text;
     int len, cnt = 0;
+    while(*name == '\n') name++;
     snprintf(buf, MSG_SIZ, ".B %s", name);
     len = strlen(buf);
-    for(len=3; buf[len] && buf[len] != '(' && buf[len] != ':' && buf[len] != '.' && buf[len] != '?'; len++);
+    for(len=3; buf[len] && buf[len] != '(' && buf[len] != ':' && buf[len] != '.' && buf[len] != '?' && buf[len] != '\n'; len++);
     buf[len] = NULLCHAR;
     while(buf[--len] == ' ') buf[len] = NULLCHAR;
     snprintf(title, MSG_SIZ, "Help on '%s'", buf+3);