X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=dialogs.c;h=19b69af10e458836f1e1a68563a9d8608c31682c;hb=fcf1b04ac104178d84c30b2824804f199061e250;hp=7ca879f0e8633494a56076171bf28c04cbbde5e7;hpb=e5fcfee6ac8d8caa96337ae9c17562e7d5c03c11;p=xboard.git

diff --git a/dialogs.c b/dialogs.c
index 7ca879f..19b69af 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);
 }
 
@@ -2484,8 +2484,8 @@ GetHelpText (FILE *f, char *name)
     while(buf[--len] == ' ') buf[len] = NULLCHAR;
     snprintf(title, MSG_SIZ, "Help on '%s'", buf+3);
     while((line = ReadLine(f))) {
-	if(!strncmp(line, buf, len) || !strncmp(line, ".SS ", 4) && !strncmp(line+4, buf+3, len-3)
-			    || !strncmp(line, ".IX Item \"", 10) && !strncmp(line+10, buf+3, len-3)) {
+	if(!strncmp(line, buf, ++len) || !strncmp(line, ".SS ", 4) && !strncmp(line+4, buf+3, len-3)
+			      || !strncmp(line, ".IX Item \"", 10) && !strncmp(line+10, buf+3, len-3)) {
 	    while((line = ReadLine(f)) && (cnt == 0 || strncmp(line, ".B ", 3) && strncmp(line, ".SS ", 4) && strncmp(line, ".IX ", 4))) {
 		if(!*line) { *p++ = '\n'; *p++ = '\n'; q = p; continue; }
 		if(*line == '.') continue;