Convert to DOS line ends

[fairymax.git] / fairymax.c

diff --git a/fairymax.c b/fairymax.c
index 2bf32d1..2c16397 100644 (file)
--- a/fairymax.c
+++ b/fairymax.c
@@ -137,7 +137,7 @@ pboard()
 D(k,q,l,e,E,z,n)        /* recursive minimax search, k=moving side, n=depth*/\r
 int k,q,l,e,E,z,n;      /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/\r
 {                       /* e=score, z=prev.dest; J,Z=hashkeys; return score*/\r
- int j,r,m,v,d,h,i,F,G,P,V,f=J,g=Z,C,s,flag,FF,*ps=sp;\r
+ int j,r,m,v,d,h,i,F,G,P,V,f=J,g=Z,C,s,flag,FF,*ps=sp,kk=S;\r
  signed char t,p,u,x,y,X,Y,H,B;\r
  struct _*a=A+(J+(k+S)*E&U-1);                 /* lookup pos. in hash table*/\r
  *sp++=0;\r
@@ -181,7 +181,7 @@ int k,q,l,e,E,z,n;      /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/
       if(flag&1+!t)                            /* mode (capt/nonc) allowed?*/\r
       {if(t&&(t&16)==k)break;                  /* capture own              */\r
        i=w[t&15]+((t&192)>>sh);                /* value of capt. piece t   */\r
-       if(i<0)m=I,d=98;                        /* K capture                */\r
+       if(i<0&&(pl[t&31]<2||kk!=H&kk!=S||(kk=H,i=-i,0)))m=I,d=98;/* K capture, duple check */\r
        if(m>=l&d>1)goto C;                     /* abort on fail high       */\r
        v=d-1?e:i-p;                            /*** MVV/LVA scoring if d=1**/\r
        if(d-!t>1)                              /*** all captures if d=2  ***/\r
@@ -238,7 +238,7 @@ int k,q,l,e,E,z,n;      /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/
         while(*p){X=*p>>8;Y=*p++;\r
         printf(" %c%c%c%c",'a'+(X&15),'8'-(X>>4),'a'+(Y&15),'8'-(Y>>4&7));}\r
         printf("\n");fflush(stdout);\r
-       }
+       }\r
        if(v>m)                                 /* new best, update max,best*/\r
         m=v,X=x,Y=y|S&F;                       /* mark non-double with S   */\r
        if(h){h=0;goto A;}                      /* redo after doing old best*/\r
@@ -798,10 +798,12 @@ int main(int argc, char **argv)
                                             break;\r
                                         default:\r
                                             b[m]=p+color+32; // assume non-virgin\r
-                                            if(w[p]<0) { // Royal piece on original square: virgin
+                                            if(w[p]<0) { // Royal piece on original square: virgin\r
                                                if(color==BLACK && m<0x10 && p==oo[m+16] ||\r
-                                                   color==WHITE && m>0x6F && p==oo[m-0x70]) b[m] -= 32;
-                                           } else { Q+=w[p]; R+=w[p]/FAC; }
+                                                   color==WHITE && m>0x6F && p==oo[m-0x70]) b[m] -= 32;\r
+                                                Q-=w[p]; // assume value was flipped to indicate royalty\r
+                                                if(pl[p+color])R-=w[p]/FAC; // capturable King, add to material\r
+                                           } else { Q+=w[p]; R+=w[p]/FAC; }\r
                                             if((m==0x00 || m==BW-1   ) && color==BLACK && p==oo[m+16] ||\r
                                                (m==0x70 || m==0x6F+BW) && color==WHITE && p==oo[m-0x70])\r
                                                 b[m] &= ~32; // corner piece as in original setup: virgin\r