X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=fairymax.c;h=f9d5bdc313e678e81a68969589aeb65bdc1de503;hb=521e08ee53bfc842ae70085867a1bd997ff6ba0f;hp=007e54265109b8535a8e7d1ce89b061b0c6fcbfd;hpb=1d45b3d1a17fe04d338478c287b31a9306e0949b;p=fairymax.git

diff --git a/fairymax.c b/fairymax.c
index 007e542..f9d5bdc 100644
--- a/fairymax.c
+++ b/fairymax.c
@@ -18,7 +18,7 @@
      /*****************************************************************/
 
 #define MULTIPATH
-#define VERSION "4.8T"
+#define VERSION "4.8U"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -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;
 
@@ -276,7 +277,7 @@ int k,q,l,e,E,z,n;      /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/
         )t+=flag&4;                            /* fake capt. for nonsliding*/
       else if(flag&64)t=flag&128?0:t,flag&=63;else F=y; /* enable e.p.     */
       if(s&&flag&8&&!(y=rg&1?y-r:y,t=0)        /* hoppers go to next phase */
-         ||!(flag&S)&&--rg<0)                  /* zig-zag piece? (w. delay)*/
+         ||!(flag&S)&&!rg--)                   /* zig-zag piece? (w. delay)*/
        r=v,flag^=flag>>4&15;                   /* alternate vector & mode  */
      }W(!t);                                   /* if not capt. continue ray*/
    }}
@@ -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);