X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=fairymax.c;h=3b2db59bf5dfe65a72095edf63edbb6a358a6300;hb=6bb0ca7a95818cda8b6a08b8815359203af4d84b;hp=e615fd4064863efa5d03562f8323da3c92e933a8;hpb=72b198f0b7575ff63748b7c02b1572ed162aef04;p=fairymax.git

diff --git a/fairymax.c b/fairymax.c
index e615fd4..3b2db59 100644
--- a/fairymax.c
+++ b/fairymax.c
@@ -93,7 +93,9 @@ int Resign;
 int Threshold = 800;
 int Score;
 int makruk;
+int prom;
 char piecename[32], piecetype[32], blacktype[32];
+char selectedFairy[80];
 char *inifile = INI_FILE;
 
 int Ticks, tlim, Setup, SetupQ;
@@ -214,8 +216,8 @@ 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)                    /*   if move found          */
-         {Q=-e-i;O=F;LL=L;
-          if(b[y]-u&15)b[y]-=PromPiece,        /* under-promotion, correct */
+         {Q=-e-i;O=F;LL=L;prom=0;
+          if(b[y]-u&15)prom=b[y]-=PromPiece,   /* under-promotion, correct */
                        J+=PromPiece;           /*  piece & invalidate hash */
           a->D=99;a->V=0;                      /* lock game in hash as draw*/
           R-=i/FAC;                            /*** total captd material ***/
@@ -246,7 +248,7 @@ int k,q,l,e,E,z,n;      /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/
          ((b[G=r<0?x&~15:BW-1|x&112]^32)<33    /* no virgin R in corner G, */
          ||b[G^1]|b[G^2]|b[FF=y+v-r])          /* no 2 empty sq. next to R */
         )t+=flag&4;                            /* fake capt. for nonsliding*/
-      else F=y;                                /* enable e.p.              */
+      else if(flag&64)t=flag&128?0:t,flag&=63;else F=y; /* enable e.p.     */
       if(s&&flag&8)t=0,flag^=flag>>4&15;       /* hoppers go to next phase */
       if(!(flag&S))                            /* zig-zag piece?           */
        r=v,flag^=flag>>4&15;                   /* alternate vector & mode  */
@@ -331,13 +333,6 @@ int PrintResult(int s)
                         printf("1-0 {Bare King}\n");
                 return 5;
         }
-        if(cnt>-I+1 && K==0 && L==0) {
-                if (s == WHITE)
-                        printf("0-1 {Stalemate}\n");
-                else
-                        printf("1-0 {Stalemate}\n");
-                return 2;
-        }
 #else
         if(cnt>-I+1 && K==0 && L==0) {
                 printf("1/2-1/2 {Stalemate}\n");
@@ -393,9 +388,9 @@ void CopyBoard(int s)
             HistoryBoards[s][BW*i+j] = b[16*i+j]|64*(16*i+j==O);
 }
                                          
-void PrintVariants()
+void PrintVariants(int combo)
 {
-        int i, j, count=0; char c, buf[80];
+        int i, j, count=0, total=0; char c, buf[80];
         FILE *f;
 
         f = fopen(INI_FILE, "r");
@@ -406,11 +401,15 @@ void PrintVariants()
            while(fscanf(f, "Game: %s", buf) != 1 && c != EOF) 
                while((c = fgetc(f)) != EOF && c != '\n');
            if(c == EOF) break;
-           if(count++) printf(",");
-           printf("%s", buf);
+           total++;
+           if(combo == (strstr(buf, "fairy/") != buf)) continue;
+           if(combo && count == 0) strcpy(selectedFairy, buf);
+           if(count++) printf(combo ? " /// " : ",");
+           printf("%s", combo ? buf+6 : buf);
         } while(c != EOF);
 
         fclose(f);
+        if(!combo && total != count) printf("%sfairy", count ? "," : "");
 }
 
 void PrintOptions()
@@ -419,9 +418,9 @@ void PrintOptions()
 	printf("feature option=\"Resign Threshold -spin %d 200 1200\"\n", Threshold);
 	printf("feature option=\"Ini File -file %s\"\n", inifile);
 	printf("feature option=\"Multi-PV Margin -spin %d 0 1000\"\n", margin);
-	printf("feature option=\"Playing Style ;-) -combo Brilliant /// *Brave /// Beautiful\"\n");
+	printf("feature option=\"Variant fairy selects -combo "); PrintVariants(1); printf("\"\n");
 	printf("feature option=\"Dummy Slider Example -slider 20 0 100\"\n");
-	printf("feature option=\"Dummy String Example -file happy birthday!\"\n");
+	printf("feature option=\"Dummy String Example -string happy birthday!\"\n");
 	printf("feature option=\"Dummy Path Example -path .\"\n");
 	printf("feature option=\"Clear Hash -button\"\n");
 	printf("feature done=1\n");
@@ -443,6 +442,7 @@ int LoadGame(char *name)
 
         if(name != NULL)
         {  /* search for game name in definition file */
+           if(!strcmp(name, "fairy")) name = selectedFairy;
            while(fscanf(f, "Game: %s", buf)!=1 || strcmp(name, buf) ) {
                while((c = fgetc(f)) != EOF && c != '\n');
                count++;
@@ -536,6 +536,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);
                             printf("\n");
                             m = GetTickCount() - Ticks;
 
@@ -574,7 +575,7 @@ int main(int argc, char **argv)
                         printf("feature memory=1\n");
                         printf("feature setboard=0 ping=1 done=0\n");
                         printf("feature variants=\"");
-                        PrintVariants();
+                        PrintVariants(0);
                         printf("\"\n");
 			PrintOptions();
                         continue;
@@ -698,6 +699,7 @@ int main(int argc, char **argv)
 			}
 			if(sscanf(line+7, "Clear Hash") == 1) for(i=0; i<U; i++) A->K = 0;
 			if(sscanf(line+7, "MultiVariation Margin=%d", &margin) == 1) continue;
+			if(sscanf(line+7, "Variant fairy selects=%s", selectedFairy+6) == 1) continue;
 			continue;
 		}
 		if (!strcmp(command, "go")) {