X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=fairymax.c;h=5341cd2fd00cb9983840fde9d22ac0ad347e646e;hb=b6a7fa8ae7c54db7bb5a9415ccae3fd55e9b360e;hp=560f64d75b8d2afba63409846209ebb1075ceb99;hpb=333c8eaf87edaf58a99775e26a72e19315c6e0a4;p=fairymax.git

diff --git a/fairymax.c b/fairymax.c
index 560f64d..5341cd2 100644
--- a/fairymax.c
+++ b/fairymax.c
@@ -100,7 +100,7 @@ int Post;
 int Fifty;
 int GameNr;
 int Resign;
-int Cambodian;
+char Cambodian[80] = "makruk";
 int Threshold = 800;
 int Score;
 int makruk;
@@ -455,7 +455,7 @@ void PrintOptions()
 	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=\"Cambodian Makruk rules -check %d\"\n", Cambodian);
+	printf("feature option=\"Makruk rules -combo makruk /// cambodian /// ai-wok\"\n");
 	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");
@@ -480,7 +480,7 @@ void LoadGame(char *name)
         gating = succession = 0;
         if(name != NULL)
         {  /* search for game name in definition file */
-           if(!strcmp(name, "makruk") && Cambodian) name = "cambodian"; else
+           if(!strcmp(name, "makruk")) name = Cambodian; else
            if(!strcmp(name, "fairy")) name = selectedFairy;
            gating = !strcmp(name, "seirawan");
            while((ptc=fscanf(f, "Game: %s # %s", buf, pieceToChar))==0 || strcmp(name, buf) ) {
@@ -498,6 +498,7 @@ void LoadGame(char *name)
         /* We have found variant, or if none specified, are at beginning of file */
         if(fscanf(f, "%dx%d", &BW, &BH)!=2 || BW>12 || BH!=8)
         { printf("telluser unsupported board size %dx%d\n",BW,BH); exit(0); }
+        makruk = 0; if(fscanf(f, "=%d", &i)) makruk=64; // new method to indicate deviant zone depth (for now assumes 3)
 
         for(i=0; i<BW; i++) fscanf(f, "%d", oo+i);
         for(i=0; i<BW; i++) fscanf(f, "%d", oo+i+16);
@@ -521,13 +522,14 @@ void LoadGame(char *name)
 
         fclose(f);
 	sh = w[7] < 250 ? 3 : 0;
-	makruk = w[7]==181 ? 64 : 0; // w[7] is used as kludge to enable makruk promotions
-        if(name == selectedFairy) {
+        if(name == selectedFairy || makruk) {
             printf(ptc == 1 ? "setup " : "setup (%s) ", pieceToChar); // setup board in GUI
             for(i=0; i<BW; i++) printf("%c", piecename[oo[i+16]]+'`'); printf("/");
+            if(makruk) printf("8/");
             for(i=0; i<BW; i++) printf("%c", piecename[2]+'`'); printf("/");
-            for(i=2; i<BH-2; i++) printf("%d/", BW);
+            for(i=2+!!makruk; i<BH-2-!!makruk; i++) printf("%d/", BW);
             for(i=0; i<BW; i++) printf("%c", piecename[1]+'@'); printf("/");
+            if(makruk) printf("8/");
             for(i=0; i<BW; i++) printf("%c", piecename[oo[i]]+'@'); printf(" w KQkq - 0 1\n");
         }
 }
@@ -746,7 +748,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;
 			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, "Cambodian Makruk rules=%d", &Cambodian) == 1) continue;
+			if(sscanf(line+7, "Makruk rules=%s", Cambodian) == 1) continue;
 			continue;
 		}
 		if (!strcmp(command, "go")) {