Use separate-kings definition in variant normal

[fairymax.git] / fairymax.c

diff --git a/fairymax.c b/fairymax.c
index 470c03a..281ccbf 100644 (file)
--- a/fairymax.c
+++ b/fairymax.c
@@ -231,13 +231,14 @@ int k,q,l,e,E,z,n;      /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/
         }\r
         if(z&S&&K-I)                           /* move pending: check legal*/\r
         {if(v+I&&x==K&y==L&gt==GT)             /*   if move found          */\r
-         {Q=-e-i;O=F;LL=L;prom=gt;\r
+         {Q=-e-i;O=F;LL=L;prom=gt&15;\r
           if(b[y]-u&15)prom=b[y]-=PromPiece,   /* (under-)promotion:       */\r
            Q-=abs(w[prom&=15])-w[p]-(6*S>>sh), /*  correct piece & score & */\r
                        Z+=PromPiece;           /*  invalidate hash         */\r
           a->D=99;a->V=0;                      /* lock game in hash as draw*/\r
           R-=i/FAC;                            /*** total captd material ***/\r
           Fifty = t|p<3?0:Fifty+1;\r
+          if(centr[p]==5)b[257+y]-=5;\r
           sp=ps;\r
                      return l;}                /*   & not in check, signal */\r
          v=m;                                  /* (prevent fail-lows on    */\r
@@ -580,6 +581,9 @@ int main(int argc, char **argv)
                         tlim = (0.6-0.06*(BW-8))*(TimeLeft+(m-1)*TimeInc)/(m+7);\r
                         if(tlim>TimeLeft/15) tlim = TimeLeft/15;\r
                         PromPiece = 0; /* Always promote to Queen ourselves */\r
+                        for(N=K=0;K<S;K++)N+=b[K]?b[K]&16?S:1:0; /* count pieces for detecting bare King */\r
+                        if(w[3]<0&w[4]<0){if(N>>8<2)centr[4]=5;if(!(N&S-2))centr[3]=5;Z+=R>4;R=4;}\r
+printf("# %d+%d pieces, centr = (%d,%d)\n", N&63, N>>7, centr[3], centr[4]);\r
                         N=0;K=I;\r
                         if(hill) centr[3] = R>20 ? 1 : 22-R;\r
                         if (D(Side,-I,I,Q,O,LL|S,3)==I) {\r
@@ -587,6 +591,7 @@ int main(int argc, char **argv)
                             m = GetTickCount() - Ticks;\r
                             printf("# times @ %u: real=%d cpu=%1.0f\n", m + Ticks, m,\r
                                       (CPUtime() - cpuT)/CLOCKS_PER_SEC);\r
+printf("# promo = %d (%c) GT = %d\n", prom, prom + '`', GT); \r
                             printf("move ");\r
                             printf("%c%c%c%c",'a'+(K&15),'0'+BH-(K>>4),\r
                                           'a'+(L&15),'0'+BH-(L>>4));\r