Implement Info option

[fairymax.git] / fairymax.c

diff --git a/fairymax.c b/fairymax.c
index 418c926..3c19a21 100644 (file)
--- a/fairymax.c
+++ b/fairymax.c
@@ -109,6 +109,7 @@ int prom, pm, gating, succession, hill;
 char piecename[32], piecetype[32], blacktype[32];\r
 char selectedFairy[80];\r
 char *inifile = INI_FILE;\r
+char info[999];\r
 \r
 int Ticks, tlim, Setup, SetupQ;\r
 \r
@@ -276,7 +277,7 @@ int k,q,l,e,E,z,n;      /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/
         )t+=flag&4;                            /* fake capt. for nonsliding*/\r
       else if(flag&64)t=flag&128?0:t,flag&=63;else F=y; /* enable e.p.     */\r
       if(s&&flag&8&&!(y=rg&1?y-r:y,t=0)        /* hoppers go to next phase */\r
-         ||!(flag&S)&&--rg<0)                  /* zig-zag piece? (w. delay)*/\r
+         ||!(flag&S)&&!rg--)                   /* zig-zag piece? (w. delay)*/\r
        r=v,flag^=flag>>4&15;                   /* alternate vector & mode  */\r
      }W(!t);                                   /* if not capt. continue ray*/\r
    }}\r
@@ -456,14 +457,15 @@ void PrintOptions()
 {\r
        printf("feature option=\"Resign -check %d\"\n", Resign);\r
        printf("feature option=\"Resign Threshold -spin %d 200 1200\"\n", Threshold);\r
+       printf("feature option=\"Claim draw after -spin %d 0 200\"\n", drawMoves);\r
        printf("feature option=\"Ini File -file %s\"\n", inifile);\r
        printf("feature option=\"Multi-PV Margin -spin %d 0 1000\"\n", margin);\r
        printf("feature option=\"Variant fairy selects -combo "); PrintVariants(1); printf("\"\n");\r
        printf("feature option=\"Makruk rules -combo makruk /// Cambodian /// Ai-wok\"\n");\r
-       printf("feature option=\"Claim draw after -spin %d 0 200\"\n", drawMoves);\r
        printf("feature option=\"Dummy Slider Example -slider 20 0 100\"\n");\r
        printf("feature option=\"Dummy String Example -string happy birthday!\"\n");\r
        printf("feature option=\"Dummy Path Example -path .\"\n");\r
+       printf("feature option=\"Info -button\"\n");\r
        printf("feature option=\"Clear Hash -button\"\n");\r
        printf("feature done=1\n");\r
 }\r
@@ -489,7 +491,9 @@ void LoadGame(char *name)
            if(!strcmp(name, "fairy")) name = selectedFairy;\r
            gating = !strcmp(name, "seirawan");\r
            while((ptc=fscanf(f, "Game: %s # %s # %s", buf, pieceToChar, parent))==0 || strcmp(name, buf) ) {\r
-               while((c = fgetc(f)) != EOF && c != '\n');\r
+               char *p = info;\r
+               while((c = fgetc(f)) != EOF && c != '\n') *p++ = c;\r
+               if(*info == '/') *p = 0; else *info = 0; // remember last line before Game if it was comment\r
                count++;\r
                if(c == EOF) {\r
                    printf("telluser variant %s not supported\n", name);\r
@@ -503,7 +507,7 @@ void LoadGame(char *name)
         /* We have found variant, or if none specified, are at beginning of file */\r
         if(fscanf(f, "%dx%d", &BW, &BH)!=2 || BW>12 || BH!=8)\r
         { printf("telluser unsupported board size %dx%d\n",BW,BH); exit(0); }\r
-        makruk = 0; if(fscanf(f, "=%d", &i)) makruk=64; // new method to indicate deviant zone depth (for now assumes 3)\r
+        makruk = 0; if(fscanf(f, "=%d", &i)) makruk=67-i; // new method to indicate deviant zone depth (for now assumes 3)\r
 \r
         for(i=0; i<BW; i++) fscanf(f, "%d", oo+i);\r
         for(i=0; i<BW; i++) fscanf(f, "%d", oo+i+16);\r
@@ -539,6 +543,7 @@ void LoadGame(char *name)
         }\r
        while(fscanf(f, " # %[^\n]", pieceToChar)) printf("piece %s\n", pieceToChar);\r
         fclose(f);\r
+       if(makruk != 64) makruk = 0; // 66 was kludge to interpret "=1" suffix in asean for setting up 3rd-rank Pawns\r
 }\r
 \r
 int main(int argc, char **argv)\r
@@ -758,6 +763,7 @@ printf("# promo = %d (%c) GT = %d\n", prom, prom + '`', GT);
                                inifile = filename; continue;\r
                        }\r
                        if(sscanf(line+7, "Clear Hash%c", &c) == 1) for(i=0; i<=U; i++) A->K = 0;\r
+                       if(sscanf(line+7, "Info%c", &c) == 1) printf("telluser %s\n", info+3);\r
                        if(sscanf(line+7, "MultiVariation Margin=%d", &margin) == 1) continue;\r
                        if(sscanf(line+7, "Variant fairy selects=%s", selectedFairy+6) == 1) continue;\r
                        if(sscanf(line+7, "Makruk rules=%s", Cambodian) == 1) continue;\r
@@ -895,7 +901,7 @@ printf("# promo = %d (%c) GT = %d\n", prom, prom + '`', GT);
                 GT = (Side == WHITE ? piecetype : blacktype)[line[4]&31];\r
                 if(GT) PromPiece = (Side == WHITE ? 7 : 7+pm) - GT, GT |= 32 + Side;\r
                 {char *c=line; K=c[0]-16*c[1]+799;L=c[2]-16*c[3]+799; }\r
-                if(w[GT&15] == -1) L = S; // spoil move for promotion to King\r
+                if(w[GT&15] == -1 || w[GT&15]%10 == 3) L = S; // spoil move for promotion to King (or when marked non-promoting)\r
                 if (m & line[1] != '@')\r
                         /* doesn't have move syntax */\r
                        printf("Error (unknown command): %s\n", command);\r