X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=fairymax.c;h=c893b3705487af214b7eeb286e958558b1fc191a;hb=01873d1eb3c3722a94baeae2007e6bd2c528901a;hp=769da7f25c4d1d7ee0af79240ec5c5adf6a83a94;hpb=0a8207c5bba7eac72a459e18be5cbd8df35b1704;p=fairymax.git

diff --git a/fairymax.c b/fairymax.c
index 769da7f..c893b37 100644
--- a/fairymax.c
+++ b/fairymax.c
@@ -149,7 +149,7 @@ D(k,q,l,e,E,z,n)        /* recursive minimax search, k=moving side, n=depth*/
 int k,q,l,e,E,z,n;      /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/
 {                       /* e=score, z=prev.dest; J,Z=hashkeys; return score*/
  int j,r,m,v,d,h,i,F,G,P,V,f=J,g=Z,C,s,flag,FF,*ps=sp,kk=S;
- signed char t,p,u,x,y,X,Y,H,B,gt;
+ signed char t,p,u,x,y,X,Y,H,B,gt,rg;
  struct _*a=A+(J+(k+S)*E&U);                   /* lookup pos. in hash table*/
  *sp++=0;
  q-=q<e;l-=l<=e;                               /* adj. window: delay bonus */
@@ -174,7 +174,7 @@ int k,q,l,e,E,z,n;      /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/
     W(r=o[++j])                                /* loop over directions o[] */
     {A:                                        /* resume normal after best */
      flag=h?3:of[j];                           /* move modes (for fairies) */
-     y=x;F=FF=G=S;                             /* (x,y)=move, (F,G)=castl.R*/
+     y=x;F=FF=G=S;rg=flag>>10&3;               /* (x,y)=move, (F,G)=castl.R*/
      do{                                       /* y traverses ray, or:     */
       H=y=h?Y^h:y+r;                           /* sneak in prev. best move */
       if(flag&1<<8)H=y=(y&15)>13?y+BW:(y&15)>=BW?y-BW:y; /* cylinder board */
@@ -273,7 +273,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)t=0,flag^=flag>>4&15;       /* hoppers go to next phase */
-      if(!(flag&S))                            /* zig-zag piece?           */
+      if(--rg<0&!(flag&S))                     /* zig-zag piece? (w. delay)*/
        r=v,flag^=flag>>4&15;                   /* alternate vector & mode  */
      }W(!t);                                   /* if not capt. continue ray*/
    }}