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

diff --git a/fairymax.c b/fairymax.c
index ba9672f..dea62b1 100644
--- a/fairymax.c
+++ b/fairymax.c
@@ -831,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;
                                         }