X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=fairymax.c;h=9f6571bd5ab5e7ac0f97ae84c0cdefdae6d2311f;hb=1a73d604f9bb1b981d36d10ea4268cce6292a09c;hp=418c9267d9f559b7e4e07553dedfa0ddd720d800;hpb=585c0bfb224b8ed20cb7718972c0443074d5864e;p=fairymax.git

diff --git a/fairymax.c b/fairymax.c
index 418c926..9f6571b 100644
--- a/fairymax.c
+++ b/fairymax.c
@@ -276,7 +276,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,11 +456,11 @@ 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");
@@ -503,7 +503,7 @@ void LoadGame(char *name)
         /* We have found variant, or if none specified, are at beginning of file */
         if(fscanf(f, "%dx%d", &BW, &BH)!=2 || BW>12 || BH!=8)
         { printf("telluser unsupported board size %dx%d\n",BW,BH); exit(0); }
-        makruk = 0; if(fscanf(f, "=%d", &i)) makruk=64; // new method to indicate deviant zone depth (for now assumes 3)
+        makruk = 0; if(fscanf(f, "=%d", &i)) makruk=67-i; // new method to indicate deviant zone depth (for now assumes 3)
 
         for(i=0; i<BW; i++) fscanf(f, "%d", oo+i);
         for(i=0; i<BW; i++) fscanf(f, "%d", oo+i+16);
@@ -539,6 +539,7 @@ void LoadGame(char *name)
         }
 	while(fscanf(f, " # %[^\n]", pieceToChar)) printf("piece %s\n", pieceToChar);
         fclose(f);
+	if(makruk != 64) makruk = 0; // 66 was kludge to interpret "=1" suffix in asean for setting up 3rd-rank Pawns
 }
 
 int main(int argc, char **argv)
@@ -895,7 +896,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);