X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=fairymax.c;h=dea62b10b404256d9482ec3fc79684121244d55c;hb=fa170c1ad7e08863206031c268e042908ad774dc;hp=c135fb661b6aa17d0a459ffc04d4c0709e90e3ac;hpb=d49765690831138d5d4debc822c71398bd72df36;p=fairymax.git

diff --git a/fairymax.c b/fairymax.c
index c135fb6..dea62b1 100644
--- a/fairymax.c
+++ b/fairymax.c
@@ -18,7 +18,7 @@
      /*****************************************************************/
 
 #define MULTIPATH
-#define VERSION "4.8P"
+#define VERSION "4.8Q"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -90,6 +90,7 @@ int Fifty;
 int UnderProm;
 int GameNr;
 int Resign;
+int Cambodian;
 int Threshold = 800;
 int Score;
 int makruk;
@@ -255,7 +256,7 @@ int k,q,l,e,E,z,n;      /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/
       }
       s=t;v=r^flag>>12;                        /* calc. alternated vector  */
       if(flag&15^4|u&32||                      /* no double or moved before*/
-         p>2&&                                 /* no P & no lateral K move,*/
+         p>2&!(flag&S)&&                       /* no P & no virgin jump,   */
          ((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*/
@@ -382,7 +383,7 @@ InitGame()
  for(i=0;i<16*BH;i++)b[i]=0;
  for(i=0;i<32;i++)pl[i]=0;
  K=BW;W(K--)
- {b[K]=oo[K+16]+16;b[K+112]=oo[K];b[K+16]=18;b[K+96]=1; /* initial board setup*/
+ {b[K]=oo[K+16]+16;b[K+112]=oo[K];b[K+16+16*!!makruk]=18;b[K+96-16*!!makruk]=1; /* initial board setup*/
   pl[oo[K+16]+16]++;pl[oo[K]]++;pl[18]++;pl[1]++;
   if(w[oo[K+16]+16] == -1)pl[oo[K+16]+16]=1;
   if(w[oo[K]] == -1)pl[oo[K]]=1;
@@ -412,7 +413,7 @@ void CopyBoard(int s)
                                          
 void PrintVariants(int combo)
 {
-        int i, j, count=0, total=0; char c, buf[80];
+        int i, j, count=0, total=0; char c=EOF+1, buf[80];
         FILE *f;
 
         f = fopen(INI_FILE, "r");
@@ -441,6 +442,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=\"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");
@@ -465,6 +467,7 @@ int LoadGame(char *name)
         gating = 0;
         if(name != NULL)
         {  /* search for game name in definition file */
+           if(!strcmp(name, "makruk") && Cambodian) 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) ) {
@@ -732,6 +735,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;
+			if(sscanf(line+7, "Cambodian Makruk rules=%d", &Cambodian) == 1) continue;
 			continue;
 		}
 		if (!strcmp(command, "go")) {
@@ -827,15 +831,12 @@ int main(int argc, char **argv)
                                             break;
                                         default:
                                             b[m]=p+color+32; // assume non-virgin
+					    if(color==BLACK && m<0x10 && p==oo[m+16] || // but make virgin on original square
+                                               color==WHITE && m>0x6F && p==oo[m-0x70]) b[m] -= 32;
                                             if(w[p]<0) { // Royal piece on original square: virgin
-					        if(color==BLACK && m<0x10 && p==oo[m+16] ||
-                                                   color==WHITE && m>0x6F && p==oo[m-0x70]) b[m] -= 32;
                                                 Q-=w[p]; // assume value was flipped to indicate royalty
                                                 if(pl[p+color])R-=w[p]/FAC; // capturable King, add to material
 					    } else { Q+=w[p]; R+=w[p]/FAC; }
-                                            if((m==0x00 || m==BW-1   ) && color==BLACK && p==oo[m+16] ||
-                                               (m==0x70 || m==0x6F+BW) && color==WHITE && p==oo[m-0x70])
-                                                b[m] &= ~32; // corner piece as in original setup: virgin
 					case 0: // undefined piece, ignore
                                             break;
                                         }
@@ -866,6 +867,7 @@ int main(int argc, char **argv)
                 else { int i=-1;
                     if(b[L] && (b[L]&16) == Side && w[b[L]&15] < 0) // capture own King: castling
                     { i=K; K = L; L = i>L ? i-1 : i+2; }
+		    if(w[GT&15] < -1) pl[GT&31]++, J+=89729; // promotion to royal piece
                     if(b[K]&32) GT = 0; // non-virgin mover => true promotion rather than gating
                     if(D(Side,-I,I,Q,O,LL|S,3)!=I) {
                         /* did have move syntax, but illegal move */