X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=fairymax.c;h=aa845dcc33f26ac0f55ad27b019ef586d65bbcde;hb=dcb0657b9bf755387c949ae37ca12402ac08eb13;hp=15e4f15b915165ae024481a9405e5375c480097b;hpb=d8b71c2edea654c591fa67f973348e34e44073c6;p=fairymax.git diff --git a/fairymax.c b/fairymax.c index 15e4f15..aa845dc 100644 --- a/fairymax.c +++ b/fairymax.c @@ -92,7 +92,7 @@ int GameNr; int Resign; int Threshold = 800; int Score; -char piecename[32], piecetype[32]; +char piecename[32], piecetype[32], blacktype[32]; char *inifile = INI_FILE; int Ticks, tlim, Setup, SetupQ; @@ -226,7 +226,7 @@ int k,q,l,e,E,z,n; /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/ SHAMAX( pl[k]+=!!t; ) b[G]=k+6;b[FF]=b[y]=0;b[x]=u;b[H]=t; /* undo move,G can be dummy */ } /* if non-castling */ - if(z&S&&Post&v>V&v2&v>V&v2&& /* no P & no lateral K move,*/ - (b[G=r<0?x&~15:BW-1|x&112]-k-6 /* no virgin R in corner G, */ + ((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=r<0?G+3:G-2]) /* no 2 empty sq. next to R */ )t+=flag&4; /* fake capt. for nonsliding*/ else F=y; /* enable e.p. */ @@ -452,14 +452,15 @@ int LoadGame(char *name) for(i=0; i='a'; - piecetype[c&31]=i; piecename[i]=c&31; + blacktype[c&31]=i; piecename[i]=c&31; + if(piecetype[c&31]==0) piecetype[c&31]=i; // only first } 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]); /**/ @@ -765,7 +766,7 @@ int main(int argc, char **argv) && line[1] >= 'a' && line[1] <= 'a'+BW-1 && line[2] >= '1' && line[2] <= '0'+BH) { m = line[1]-16*line[2]+799; - switch(p = piecetype[line[0]&31]) + switch(p = (color == WHITE ? piecetype : blacktype)[line[0]&31]) { case 1: case 2: @@ -775,23 +776,16 @@ int main(int argc, char **argv) else b[m]=(m&0x70)==0x10?18:50, Q+=w[2]; break; - case 3: // can castle, normally King - b[m]=3+color+32; - if(m==BW>>1 && color==BLACK || - m==0x70+(BW>>1) && color==WHITE) - b[m] -= 32; - break; - case 6: // can castle, normally Rook - b[m]=6+color+32; - if((m==0x00 || m==BW-1 ) && color==BLACK || - (m==0x70 || m==0x6F+BW) && color==WHITE) - b[m] -= 32; - Q+=w[6]; R+=w[6]/FAC; - break; default: - b[m]=p+color; - Q+=w[p]; R+=w[p]/FAC; - case 0: // undefined piece, ignore + b[m]=p+color+32; // assume non-virgin + 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; + } 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; } pl[BLACK+WHITE-color]++; @@ -810,7 +804,7 @@ int main(int argc, char **argv) m = line[0]<'a' | line[0]>='a'+BW | line[1]<'1' | line[1]>='1'+BH | line[2]<'a' | line[2]>='a'+BW | line[3]<'1' | line[3]>='1'+BH; if(line[4] == '\n') line[4] = piecename[7]; - PromPiece = 7 - piecetype[line[4]&31]; + PromPiece = 7 - (Side == WHITE ? piecetype : blacktype)[line[4]&31]; if(PromPiece == 7) PromPiece = 0; {char *c=line; K=c[0]-16*c[1]+799;L=c[2]-16*c[3]+799; } if (m)