X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=fairymax.c;h=6f420ae8969c7fb5d4e1ec4d9a46219a082d72b7;hb=b170de109dfcfa9db25c93006f9e1ef417243aa9;hp=792ceeb730f88f0c655a3f5c31bdd179edf9ffc8;hpb=857ddcade2d574782d3d8643bedcaf42b79f483f;p=fairymax.git

diff --git a/fairymax.c b/fairymax.c
index 792ceeb..6f420ae 100644
--- a/fairymax.c
+++ b/fairymax.c
@@ -18,7 +18,7 @@
      /*****************************************************************/
 
 #define MULTIPATH
-#define VERSION "4.8R"
+#define VERSION "4.8S"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -187,7 +187,7 @@ int k,q,l,e,E,z,n;      /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/
       }
 #endif
       m=E<16|(E^112)<16&&flag&1&y-E<2&E-y<2?I:m;      /* bad castling  */
-      if(p<3&y==E)H=z&127;                     /* shift capt.sqr. H if e.p.*/
+      if(p<3&y==E&flag)H=z&127;                /* shift capt.sqr. H if e.p.*/
       t=b[H];
       if(flag&1+!t)                            /* mode (capt/nonc) allowed?*/
       {if(t&&(t&16)==k)break;                  /* capture own              */
@@ -231,8 +231,9 @@ int k,q,l,e,E,z,n;      /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/
         if(z&S&&K-I)                           /* move pending: check legal*/
         {if(v+I&&x==K&y==L&gt==GT)             /*   if move found          */
          {Q=-e-i;O=F;LL=L;prom=gt;
-          if(b[y]-u&15)prom=b[y]-=PromPiece,   /* under-promotion, correct */
-                       Z+=PromPiece;           /*  piece & invalidate hash */
+          if(b[y]-u&15)prom=b[y]-=PromPiece,   /* (under-)promotion:       */
+           Q-=abs(w[prom&=15])-w[p]-6*S,       /*  correct piece & score & */
+                       Z+=PromPiece;           /*  invalidate hash         */
           a->D=99;a->V=0;                      /* lock game in hash as draw*/
           R-=i/FAC;                            /*** total captd material ***/
           Fifty = t|p<3?0:Fifty+1;
@@ -582,7 +583,7 @@ int main(int argc, char **argv)
                             printf("move ");
                             printf("%c%c%c%c",'a'+(K&15),'0'+BH-(K>>4),
                                           'a'+(L&15),'0'+BH-(L>>4));
-			    if(prom)printf("%c",piecename[prom&15]+'a'-1);
+			    if(prom)printf("%c",piecename[prom]+'a'-1);
                             printf("\n");
 
                             /* time-control accounting */
@@ -808,7 +809,7 @@ int main(int argc, char **argv)
 			continue;
 		}
                 if (!strcmp(command, "edit")) {
-                        int color = WHITE, p;
+                        int color = WHITE, p, r;
 
                         while(fgets(line, 256, stdin)) {
                                 m = line[0];
@@ -835,16 +836,16 @@ int main(int argc, char **argv)
                                     } else
                                     if(line[1] >= 'a' && line[1] <= 'a'+BW-1
                                     && line[2] >= '1' && line[2] <= '0'+BH) {
-                                        m = line[1]-16*line[2]+799;
+                                        m = line[1]-16*line[2]+799; r = m & 0x70;
                                         switch(p)
                                         {
                                         case 1:
                                         case 2:
                                             if(color==WHITE)
-                                                 b[m]=(m&0x70)==0x60?1:33,
-                                                 Q+=w[1];
-                                            else b[m]=(m&0x70)==0x10?18:50,
-                                                 Q+=w[2];
+                                                 b[m]=r==0x10?161:r==0x20?97:r==0x60?1:33,
+                                                 Q+=w[1]+(r==0x10?S:r==0x20?64:0);
+                                            else b[m]=r==0x60?178:r==0x50?114:r==0x10?18:50,
+                                                 Q+=w[2]+(r==0x60?S:r==0x50?64:0);
                                             break;
                                         default:
                                             b[m]=p+color+32; // assume non-virgin