Fix spurious setup command at startup

[fairymax.git] / fairymax.c

diff --git a/fairymax.c b/fairymax.c
index 94edc78..f20bb1f 100644 (file)
--- a/fairymax.c
+++ b/fairymax.c
@@ -18,7 +18,7 @@
      /*****************************************************************/\r
 \r
 #define MULTIPATH\r
-#define VERSION "4.8S"\r
+#define VERSION "4.8T"\r
 \r
 #include <stdio.h>\r
 #include <stdlib.h>\r
@@ -100,7 +100,7 @@ int Post;
 int Fifty;\r
 int GameNr;\r
 int Resign;\r
-int Cambodian;\r
+char Cambodian[80] = "makruk";\r
 int Threshold = 800;\r
 int Score;\r
 int makruk;\r
@@ -342,6 +342,11 @@ int PrintResult(int s)
             }\r
           differs: ;\r
         }\r
+\r
+\r
+\r
+\r
+\r
         K=I;\r
         cnt = D(s,-I,I,Q,O,LL|4*S,3);\r
 #ifdef SHATRANJ\r
@@ -438,7 +443,7 @@ void PrintVariants(int combo)
                while((c = fgetc(f)) != EOF && c != '\n');\r
            if(c == EOF) break;\r
            total++;\r
-           if(combo == (strstr(buf, "fairy/") != buf)) continue;\r
+           if(*buf < 'a' || combo == (strstr(buf, "fairy/") != buf)) continue;\r
            if(combo && count == 0) strcpy(selectedFairy, buf);\r
            if(count++) printf(combo ? " /// " : ",");\r
            printf("%s", combo ? buf+6 : buf);\r
@@ -455,7 +460,7 @@ void PrintOptions()
        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=\"Cambodian Makruk rules -check %d\"\n", Cambodian);\r
+       printf("feature option=\"Makruk rules -combo makruk /// Cambodian /// Ai-wok\"\n");\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
@@ -465,7 +470,7 @@ void PrintOptions()
                                          \r
 void LoadGame(char *name)\r
 {\r
-        int i, j, ptc, count=0; char c, buf[80], pieceToChar[80];\r
+        int i, j, ptc=0, count=0; char c, buf[80], pieceToChar[80], parent[80];\r
         static int currentVariant;\r
         FILE *f;\r
 \r
@@ -480,10 +485,10 @@ void LoadGame(char *name)
         gating = succession = 0;\r
         if(name != NULL)\r
         {  /* search for game name in definition file */\r
-           if(!strcmp(name, "makruk") && Cambodian) name = "cambodian"; else\r
+           if(!strcmp(name, "makruk")) name = Cambodian; else\r
            if(!strcmp(name, "fairy")) name = selectedFairy;\r
            gating = !strcmp(name, "seirawan");\r
-           while((ptc=fscanf(f, "Game: %s # %s", buf, pieceToChar))==0 || strcmp(name, buf) ) {\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
                count++;\r
                if(c == EOF) {\r
@@ -522,12 +527,15 @@ void LoadGame(char *name)
 \r
         fclose(f);\r
        sh = w[7] < 250 ? 3 : 0;\r
-        if(name == selectedFairy) {\r
-            printf(ptc == 1 ? "setup " : "setup (%s) ", pieceToChar); // setup board in GUI\r
+        if(ptc > 1) { // setup board in GUI, by sending it pieceToCharTable and FEN\r
+            if(ptc == 2) printf("setup (%s) ", pieceToChar);\r
+            else printf("setup (%s) %dx%d+0_%s ", pieceToChar, BW, BH, parent);\r
             for(i=0; i<BW; i++) printf("%c", piecename[oo[i+16]]+'`'); printf("/");\r
+            if(makruk) printf("8/");\r
             for(i=0; i<BW; i++) printf("%c", piecename[2]+'`'); printf("/");\r
-            for(i=2; i<BH-2; i++) printf("%d/", BW);\r
+            for(i=2+!!makruk; i<BH-2-!!makruk; i++) printf("%d/", BW);\r
             for(i=0; i<BW; i++) printf("%c", piecename[1]+'@'); printf("/");\r
+            if(makruk) printf("8/");\r
             for(i=0; i<BW; i++) printf("%c", piecename[oo[i]]+'@'); printf(" w KQkq - 0 1\n");\r
         }\r
 }\r
@@ -746,7 +754,7 @@ int main(int argc, char **argv)
                        if(sscanf(line+7, "Clear Hash%c", &c) == 1) for(i=0; i<=U; i++) A->K = 0;\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, "Cambodian Makruk rules=%d", &Cambodian) == 1) continue;\r
+                       if(sscanf(line+7, "Makruk rules=%s", Cambodian) == 1) continue;\r
                        continue;\r
                }\r
                if (!strcmp(command, "go")) {\r
@@ -899,6 +907,8 @@ int main(int argc, char **argv)
                         CopyBoard(HistPtr=HistPtr+1&1023);\r
                         if(PrintResult(Side)) Computer = EMPTY;\r
                    }\r
+\r
                }\r
        }\r
+       return 0;\r
 }\r