X-Git-Url: http://winboard.nl/cgi-bin?p=fairymax.git;a=blobdiff_plain;f=fairymax.c;h=5df22c20e28ca706ede553c0db616316619dee94;hp=9589df7fed3dd4b77c3748da66f83eeda740ec22;hb=HEAD;hpb=1791a18da3fdc051bdc8d1942827fd30a0cc2333

diff --git a/fairymax.c b/fairymax.c
index 9589df7..5df22c2 100644
--- a/fairymax.c
+++ b/fairymax.c
@@ -1,13 +1,16 @@
 /***************************************************************************/
-/*                               fairy-Max,                                */
+/*                               Fairy-Max,                                */
 /* Version of the sub-2KB (source) micro-Max Chess program, fused to a     */
 /* generic WinBoard interface, loading its move-generator tables from file */
 /***************************************************************************/
 
      /*****************************************************************/
      /*                      LICENCE NOTIFICATION                     */
-     /* Fairy-Max 4.8 is free software, and you have my permission do */
-     /* with it whatever you want, whether it is commercial or not.   */
+     /* Fairy-Max 4.8 is free software, released in the public domain */
+     /* so that you have my permission do with it whatever you want,  */
+     /* whether it is commercial or not, at your own risk. Those that */
+     /* are not comfortable with this, can also use or redistribute   */
+     /* it under the GNU Public License or the MIT License.           */
      /* Note, however, that Fairy-Max can easily be configured through*/
      /* its fmax.ini file to play Chess variants that are legally pro-*/
      /* tected by patents, and that to do so would also require per-  */
@@ -18,7 +21,7 @@
      /*****************************************************************/
 
 #define MULTIPATH
-#define VERSION "4.8T"
+#define VERSION "4.8V"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -109,6 +112,7 @@ int prom, pm, gating, succession, hill;
 char piecename[32], piecetype[32], blacktype[32];
 char selectedFairy[80];
 char *inifile = INI_FILE;
+char info[999];
 
 int Ticks, tlim, Setup, SetupQ;
 
@@ -456,14 +460,15 @@ void PrintOptions()
 {
 	printf("feature option=\"Resign -check %d\"\n", Resign);
 	printf("feature option=\"Resign Threshold -spin %d 200 1200\"\n", Threshold);
+	printf("feature option=\"Claim draw after -spin %d 0 200\"\n", drawMoves);
 	printf("feature option=\"Ini File -file %s\"\n", inifile);
 	printf("feature option=\"Multi-PV Margin -spin %d 0 1000\"\n", margin);
 	printf("feature option=\"Variant fairy selects -combo "); PrintVariants(1); printf("\"\n");
 	printf("feature option=\"Makruk rules -combo makruk /// Cambodian /// Ai-wok\"\n");
-	printf("feature option=\"Claim draw after -spin %d 0 200\"\n", drawMoves);
 	printf("feature option=\"Dummy Slider Example -slider 20 0 100\"\n");
 	printf("feature option=\"Dummy String Example -string happy birthday!\"\n");
 	printf("feature option=\"Dummy Path Example -path .\"\n");
+	printf("feature option=\"Info -button\"\n");
 	printf("feature option=\"Clear Hash -button\"\n");
 	printf("feature done=1\n");
 }
@@ -489,7 +494,9 @@ void LoadGame(char *name)
            if(!strcmp(name, "fairy")) name = selectedFairy;
            gating = !strcmp(name, "seirawan");
            while((ptc=fscanf(f, "Game: %s # %s # %s", buf, pieceToChar, parent))==0 || strcmp(name, buf) ) {
-               while((c = fgetc(f)) != EOF && c != '\n');
+               char *p = info;
+               while((c = fgetc(f)) != EOF && c != '\n') *p++ = c;
+               if(*info == '/') *p = 0; else *info = 0; // remember last line before Game if it was comment
                count++;
                if(c == EOF) {
                    printf("telluser variant %s not supported\n", name);
@@ -539,7 +546,7 @@ void LoadGame(char *name)
         }
 	while(fscanf(f, " # %[^\n]", pieceToChar)) printf("piece %s\n", pieceToChar);
         fclose(f);
-	if(makruk != 64) makruk = 0; // 66 was kludge to interpret "=1" suffix in asean for setting up 3rd-rank Pawns
+	if(makruk == 66) makruk = 8; // 66 was kludge to interpret "=1" suffix in asean for setting up 3rd-rank Pawns
 }
 
 int main(int argc, char **argv)
@@ -549,6 +556,8 @@ int main(int argc, char **argv)
         int m, nr;
         double cpuT;
 
+        if(argc > 1 && !strcmp(argv[1], "-v")) argc++, argv--, printf("%s\n", VERSION), exit(0);
+
         if(argc>1 && sscanf(argv[1], "%d", &m)==1)
         { U = (1<<m)-1; argc--; argv++; }
         A = (struct _ *) calloc(U+1, sizeof(struct _));
@@ -557,8 +566,6 @@ int main(int argc, char **argv)
 	signal(SIGINT, SIG_IGN);
         printf("tellics say     " NAME " " VERSION "\n");
         printf("tellics say     by H.G. Muller\n");
-        printf("tellics say Gothic Chess is protected by U.S. patent #6,481,716 by Ed Trice.\n");
-        printf("tellics say Falcon Chess is protected by U.S. patent #5,690,334 by George W. Duke\n");
         InitEngine();
         LoadGame(NULL);
         InitGame();
@@ -585,8 +592,8 @@ int main(int argc, char **argv)
                         if(tlim>TimeLeft/15) tlim = TimeLeft/15;
                         PromPiece = 0; /* Always promote to Queen ourselves */
                         for(N=K=0;K<S;K++)N+=b[K]?b[K]&16?S:1:0; /* count pieces for detecting bare King */
-                        if(w[3]<0&w[4]<0){if(N>>8<2)centr[4]=5;if(!(N&S-2))centr[3]=5;Z+=R>4;R=4;}
-printf("# %d+%d pieces, centr = (%d,%d)\n", N&63, N>>7, centr[3], centr[4]);
+                        if(w[3]<0&w[4]<0){if(N<2*S)centr[4]=5,Z+=R>4,R=4;if(!(N&S-2))centr[3]=5,Z+=R>4,R=4;}
+printf("# %d+%d pieces, centr = (%d,%d) R=%d\n", N&63, N>>7, centr[3], centr[4], R);
                         N=0;K=I;
                         if(hill) centr[3] = R>20 ? 1 : 22-R;
                         if (D(Side,-I,I,Q,O,LL|S,3)==I) {
@@ -759,6 +766,7 @@ printf("# promo = %d (%c) GT = %d\n", prom, prom + '`', GT);
 				inifile = filename; continue;
 			}
 			if(sscanf(line+7, "Clear Hash%c", &c) == 1) for(i=0; i<=U; i++) A->K = 0;
+			if(sscanf(line+7, "Info%c", &c) == 1) printf("telluser %s\n", info+3);
 			if(sscanf(line+7, "MultiVariation Margin=%d", &margin) == 1) continue;
 			if(sscanf(line+7, "Variant fairy selects=%s", selectedFairy+6) == 1) continue;
 			if(sscanf(line+7, "Makruk rules=%s", Cambodian) == 1) continue;