Fix undo in variant seirawan

[fairymax.git] / fairymax.c

diff --git a/fairymax.c b/fairymax.c
index c68ca20..dfa3ea6 100644 (file)
--- a/fairymax.c
+++ b/fairymax.c
@@ -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
@@ -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
@@ -843,6 +850,7 @@ int main(int argc, char **argv)
                                         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