X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=fairymax.c;h=3c19a21c9ea00672b13705202f4234bdb6533490;hb=774b3b1216f067dd963d72af7d8043d98338dfb7;hp=2046aaa34e153c0304862545efa52534b90d5d0d;hpb=53922e6c4e1aec25ccd20e4e46483846c93fd775;p=fairymax.git

diff --git a/fairymax.c b/fairymax.c
index 2046aaa..3c19a21 100644
--- a/fairymax.c
+++ b/fairymax.c
@@ -109,6 +109,7 @@ int prom, pm, gating, succession, hill;
 char piecename[32], piecetype[32], blacktype[32];
 char selectedFairy[80];
 char *inifile = INI_FILE;
+char info[999];
 
 int Ticks, tlim, Setup, SetupQ;
 
@@ -456,14 +457,15 @@ void PrintOptions()
 {
 	printf("feature option=\"Resign -check %d\"\n", Resign);
 	printf("feature option=\"Resign Threshold -spin %d 200 1200\"\n", Threshold);
+	printf("feature option=\"Claim draw after -spin %d 0 200\"\n", drawMoves);
 	printf("feature option=\"Ini File -file %s\"\n", inifile);
 	printf("feature option=\"Multi-PV Margin -spin %d 0 1000\"\n", margin);
 	printf("feature option=\"Variant fairy selects -combo "); PrintVariants(1); printf("\"\n");
 	printf("feature option=\"Makruk rules -combo makruk /// Cambodian /// Ai-wok\"\n");
-	printf("feature option=\"Claim draw after -spin %d 0 200\"\n", drawMoves);
 	printf("feature option=\"Dummy Slider Example -slider 20 0 100\"\n");
 	printf("feature option=\"Dummy String Example -string happy birthday!\"\n");
 	printf("feature option=\"Dummy Path Example -path .\"\n");
+	printf("feature option=\"Info -button\"\n");
 	printf("feature option=\"Clear Hash -button\"\n");
 	printf("feature done=1\n");
 }
@@ -489,7 +491,9 @@ void LoadGame(char *name)
            if(!strcmp(name, "fairy")) name = selectedFairy;
            gating = !strcmp(name, "seirawan");
            while((ptc=fscanf(f, "Game: %s # %s # %s", buf, pieceToChar, parent))==0 || strcmp(name, buf) ) {
-               while((c = fgetc(f)) != EOF && c != '\n');
+               char *p = info;
+               while((c = fgetc(f)) != EOF && c != '\n') *p++ = c;
+               if(*info == '/') *p = 0; else *info = 0; // remember last line before Game if it was comment
                count++;
                if(c == EOF) {
                    printf("telluser variant %s not supported\n", name);
@@ -759,6 +763,7 @@ printf("# promo = %d (%c) GT = %d\n", prom, prom + '`', GT);
 				inifile = filename; continue;
 			}
 			if(sscanf(line+7, "Clear Hash%c", &c) == 1) for(i=0; i<=U; i++) A->K = 0;
+			if(sscanf(line+7, "Info%c", &c) == 1) printf("telluser %s\n", info+3);
 			if(sscanf(line+7, "MultiVariation Margin=%d", &margin) == 1) continue;
 			if(sscanf(line+7, "Variant fairy selects=%s", selectedFairy+6) == 1) continue;
 			if(sscanf(line+7, "Makruk rules=%s", Cambodian) == 1) continue;
@@ -896,7 +901,7 @@ printf("# promo = %d (%c) GT = %d\n", prom, prom + '`', GT);
                 GT = (Side == WHITE ? piecetype : blacktype)[line[4]&31];
                 if(GT) PromPiece = (Side == WHITE ? 7 : 7+pm) - GT, GT |= 32 + Side;
                 {char *c=line; K=c[0]-16*c[1]+799;L=c[2]-16*c[3]+799; }
-                if(w[GT&15] == -1) L = S; // spoil move for promotion to King
+                if(w[GT&15] == -1 || w[GT&15]%10 == 3) L = S; // spoil move for promotion to King (or when marked non-promoting)
                 if (m & line[1] != '@')
                         /* doesn't have move syntax */
 			printf("Error (unknown command): %s\n", command);