X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=fairymax.c;h=15a5ce542683134c30c6d6acc40f3c8fe21f0013;hb=804ec8ebc971e4e92c96e7209df3f0743a36a70b;hp=cf62466cd0a95e85d52ddef9854c7128fefaf20d;hpb=a1b49a22d4f243c8bda00c3f630dbabac8508b15;p=fairymax.git

diff --git a/fairymax.c b/fairymax.c
index cf62466..15a5ce5 100644
--- a/fairymax.c
+++ b/fairymax.c
@@ -18,7 +18,7 @@
      /*****************************************************************/
 
 #define MULTIPATH
-#define VERSION "4.8R"
+#define VERSION "4.8S"
 
 #include <stdio.h>
 #include <stdlib.h>
@@ -104,7 +104,7 @@ int Cambodian;
 int Threshold = 800;
 int Score;
 int makruk;
-int prom, pm, gating;
+int prom, pm, gating, succession;
 char piecename[32], piecetype[32], blacktype[32];
 char selectedFairy[80];
 char *inifile = INI_FILE;
@@ -187,7 +187,7 @@ int k,q,l,e,E,z,n;      /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/
       }
 #endif
       m=E<16|(E^112)<16&&flag&1&y-E<2&E-y<2?I:m;      /* bad castling  */
-      if(p<3&y==E)H=z&127;                     /* shift capt.sqr. H if e.p.*/
+      if(p<3&y==E&flag)H=z&127;                /* shift capt.sqr. H if e.p.*/
       t=b[H];
       if(flag&1+!t)                            /* mode (capt/nonc) allowed?*/
       {if(t&&(t&16)==k)break;                  /* capture own              */
@@ -364,8 +364,12 @@ int PrintResult(int s)
         if(cnt==-I+1) {
                 if (s == WHITE)
                         printf("0-1 {Black mates}\n");
-                else
+                else {
+                        if(succession) { // suppress loss claim if black might be able to replace its King by promotion
+                            for(j=0;j<BW;j++)if((b[j+96]&31)==18)return 0;
+                        }
                         printf("1-0 {White mates}\n");
+                }
                 return 3;
         }
         if(Fifty >=100) {
@@ -472,7 +476,7 @@ void LoadGame(char *name)
         if(fscanf(f, "version 4.8(%c)", &c)!=1 || c != 'w')
         { printf("telluser incompatible fmax.ini file\n"); exit(0); }
 
-        gating = 0;
+        gating = succession = 0;
         if(name != NULL)
         {  /* search for game name in definition file */
            if(!strcmp(name, "makruk") && Cambodian) name = "cambodian"; else
@@ -507,6 +511,7 @@ void LoadGame(char *name)
             { od[++i]=j; centr[i] = c>='a';
               blacktype[c&31]=i; piecename[i]=c&31;
               if(piecetype[c&31]==0) piecetype[c&31]=i; // only first
+              succession |= w[i] < -4;         // expendable royalty; assume we can promote to it
             }
             j++; o[j]=0;
             /* printf("# c='%c' i=%d od[i]=%d j=%d (%3d,%8x)\n",c?c:' ',i,od[i],j,o[j-1],of[j-1]); /**/
@@ -803,7 +808,7 @@ int main(int argc, char **argv)
 			continue;
 		}
                 if (!strcmp(command, "edit")) {
-                        int color = WHITE, p;
+                        int color = WHITE, p, r;
 
                         while(fgets(line, 256, stdin)) {
                                 m = line[0];
@@ -830,16 +835,16 @@ int main(int argc, char **argv)
                                     } else
                                     if(line[1] >= 'a' && line[1] <= 'a'+BW-1
                                     && line[2] >= '1' && line[2] <= '0'+BH) {
-                                        m = line[1]-16*line[2]+799;
+                                        m = line[1]-16*line[2]+799; r = m & 0x70;
                                         switch(p)
                                         {
                                         case 1:
                                         case 2:
                                             if(color==WHITE)
-                                                 b[m]=(m&0x70)==0x60?1:33,
-                                                 Q+=w[1];
-                                            else b[m]=(m&0x70)==0x10?18:50,
-                                                 Q+=w[2];
+                                                 b[m]=r==0x10?161:r==0x20?97:r==0x60?1:33,
+                                                 Q+=w[1]+(r==0x10?S:r==0x20?64:0);
+                                            else b[m]=r==0x60?178:r==0x50?114:r==0x10?18:50,
+                                                 Q+=w[2]+(r==0x60?S:r==0x50?64:0);
                                             break;
                                         default:
                                             b[m]=p+color+32; // assume non-virgin
@@ -874,6 +879,7 @@ int main(int argc, char **argv)
                 GT = (Side == WHITE ? piecetype : blacktype)[line[4]&31];
                 if(GT) PromPiece = (Side == WHITE ? 7 : 7+pm) - GT, GT |= 32 + Side;
                 {char *c=line; K=c[0]-16*c[1]+799;L=c[2]-16*c[3]+799; }
+                if(w[GT&15] == -1) L = S; // spoil move for promotion to King
                 if (m & line[1] != '@')
                         /* doesn't have move syntax */
 			printf("Error (unknown command): %s\n", command);