Fix undo in variant seirawan

[fairymax.git] / fairymax.c

diff --git a/fairymax.c b/fairymax.c
index ba9672f..dfa3ea6 100644 (file)
--- a/fairymax.c
+++ b/fairymax.c
@@ -18,7 +18,7 @@
      /*****************************************************************/\r
 \r
 #define MULTIPATH\r
-#define VERSION "4.8Q"\r
+#define VERSION "4.8R"\r
 \r
 #include <stdio.h>\r
 #include <stdlib.h>\r
@@ -68,10 +68,10 @@ int StartKey;
 #endif\r
 \r
 /* make unique integer from engine move representation */\r
-#define PACK_MOVE 256*K + L + (PromPiece << 16);\r
+#define PACK_MOVE 256*K + L + (PromPiece << 16) + (GT<<24);\r
 \r
 /* convert intger argument back to engine move representation */\r
-#define UNPACK_MOVE(A) K = (A)>>8 & 255; L = (A) & 255; PromPiece = (A)>>16 & 255;\r
+#define UNPACK_MOVE(A) K = (A)>>8 & 255; L = (A) & 255; PromPiece = (A)>>16 & 255; GT = (A)>>24 & 255;\r
 \r
 /* Global variables visible to engine. Normally they */\r
 /* would be replaced by the names under which these  */\r
@@ -222,7 +222,7 @@ int k,q,l,e,E,z,n;      /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/
         {if(v+I&&x==K&y==L&gt==GT)             /*   if move found          */\r
          {Q=-e-i;O=F;LL=L;prom=gt;\r
           if(b[y]-u&15)prom=b[y]-=PromPiece,   /* under-promotion, correct */\r
-                       J+=PromPiece;           /*  piece & invalidate hash */\r
+                       Z+=PromPiece;           /*  piece & 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
@@ -608,7 +608,7 @@ int main(int argc, char **argv)
                 if (!strcmp(command, "protover")) {\r
                         printf("feature myname=\"" NAME " " VERSION "\"\n");\r
                         printf("feature memory=1\n");\r
-                        printf("feature setboard=0 ping=1 done=0\n");\r
+                        printf("feature setboard=0 xedit=1 ping=1 done=0\n");\r
                         printf("feature variants=\"");\r
                         PrintVariants(0);\r
                         printf("\"\n");\r
@@ -815,11 +815,18 @@ int main(int argc, char **argv)
                                         Q = -Q;\r
                                         continue;\r
                                 }\r
-                                if( m >= 'A' && m <= 'Z' && piecetype[m&31]\r
-                                    && line[1] >= 'a' && line[1] <= 'a'+BW-1\r
+                                if( m >= 'A' && m <= 'Z' && piecetype[m&31]) {\r
+                                    p = (color == WHITE ? piecetype : blacktype)[line[0]&31];\r
+                                    if(line[1] == '@') { // stuff holdings\r
+                                        pl[color+p+5] = m = line[2] - '0';\r
+                                        pl[BLACK+WHITE-color]+=m;pl[p+color]+=m;\r
+                                        Q+=m*w[p]; R+=m*(w[p]/FAC);\r
+                                        continue;\r
+                                    } else\r
+                                    if(line[1] >= 'a' && line[1] <= 'a'+BW-1\r
                                     && line[2] >= '1' && line[2] <= '0'+BH) {\r
                                         m = line[1]-16*line[2]+799;\r
-                                        switch(p = (color == WHITE ? piecetype : blacktype)[line[0]&31])\r
+                                        switch(p)\r
                                         {\r
                                         case 1:\r
                                         case 2:\r
@@ -831,21 +838,19 @@ int main(int argc, char **argv)
                                             break;\r
                                         default:\r
                                             b[m]=p+color+32; // assume non-virgin\r
+                                           if(color==BLACK && m<0x10 && p==oo[m+16] || // but make virgin on original square\r
+                                               color==WHITE && m>0x6F && p==oo[m-0x70]) b[m] -= 32;\r
                                             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;\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
                                        case 0: // undefined piece, ignore\r
                                             break;\r
                                         }\r
                                         pl[BLACK+WHITE-color]++;pl[p+color]++;\r
                                         if(w[p+color] == -1)pl[p+color]=1; // fake we have one if value = -1, to thwart extinction condition\r
                                         continue;\r
+                                    }\r
                                 }\r
                         }\r
                         if(Side != color) Q = -Q;\r