Make undo work in Seirawan Chess

[fairymax.git] / fairymax.c

diff --git a/fairymax.c b/fairymax.c
index 3a89dd5..ce2d7ae 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;\r
+#define PACK_MOVE 256*K + L + (PromPiece << 16);\r
 \r
 /* convert intger argument back to engine move representation */\r
-#define UNPACK_MOVE(A) K = (A)>>8 & 255; L = (A) & 255;\r
+#define UNPACK_MOVE(A) K = (A)>>8 & 255; L = (A) & 255; PromPiece = (A)>>16 & 255;\r
 \r
 /* Global variables visible to engine. Normally they */\r
 /* would be replaced by the names under which these  */\r
@@ -93,7 +93,7 @@ int Resign;
 int Threshold = 800;\r
 int Score;\r
 int makruk;\r
-int prom, pm;\r
+int prom, pm, gating;\r
 char piecename[32], piecetype[32], blacktype[32];\r
 char selectedFairy[80];\r
 char *inifile = INI_FILE;\r
@@ -225,6 +225,8 @@ int k,q,l,e,E,z,n;      /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/
           R-=i/FAC;                            /*** total captd material ***/\r
           Fifty = t|p<3?0:Fifty+1;\r
           sp=ps;\r
+          if(!(u&32)&PromPiece&(K&112)==(k?0:112))\r
+           prom=b[K]=39+k-PromPiece,J+=333,pl[k+14-PromPiece]--; /* gating    */\r
                      return l;}                /*   & not in check, signal */\r
          v=m;                                  /* (prevent fail-lows on    */\r
         }                                      /*   K-capt. replies)       */\r
@@ -387,6 +389,7 @@ InitGame()
  R -= 2*(-k/FAC);\r
  UnderProm = -1; pl[WHITE] = pl[BLACK] = 2*BW; \r
  pm = !pl[BLACK+7] && pl[BLACK+9] && pl[WHITE+7] ? 2 : 0; // Unlike white, black has no 'Q', so promote to 9, which he does have.\r
+ if(gating) pl[13] = pl[15] = pl[29] = pl[31] = 1, R += 2*(w[6]/FAC + w[8]/FAC);\r
 }\r
 \r
 void CopyBoard(int s)\r
@@ -452,9 +455,11 @@ int LoadGame(char *name)
         if(fscanf(f, "version 4.8(%c)", &c)!=1 || c != 'w')\r
         { printf("telluser incompatible fmax.ini file\n"); exit(0); }\r
 \r
+        gating = 0;
         if(name != NULL)\r
         {  /* search for game name in definition file */\r
-           if(!strcmp(name, "fairy")) name = selectedFairy;\r
+           if(!strcmp(name, "fairy")) name = selectedFairy;
+           gating = !strcmp(name, "seirawan");\r
            while((ptc=fscanf(f, "Game: %s # %s", buf, pieceToChar))==0 || strcmp(name, buf) ) {\r
                while((c = fgetc(f)) != EOF && c != '\n');\r
                count++;\r
@@ -544,9 +549,12 @@ 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
+                        if(pl[Side+13])PromPiece=1;else if(pl[Side+15])PromPiece=-1; /* S-Chess gating */\r
                         N=0;K=I;\r
                         if (D(Side,-I,I,Q,O,LL|S,3)==I) {\r
                             Side ^= BLACK^WHITE;\r
+                            if(b[K]&&Score+D(Side,-I,I,Q,2*S,2*S,2)>S)\r
+                                prom=b[K]=0,J-=333,pl[30-Side-PromPiece]++; /* undo bad gating */\r
                             if(UnderProm>=0 && UnderProm != L)\r
                             {    printf("tellics I hate under-promotions!\n");\r
                                  printf("resign { underpromotion } \n");\r