Fix virginity of pieces in setup position

[fairymax.git] / fairymax.c

diff --git a/fairymax.c b/fairymax.c
index ba9672f..dea62b1 100644 (file)
--- a/fairymax.c
+++ b/fairymax.c
@@ -831,15 +831,12 @@ int main(int argc, char **argv)
                                             break;\r
                                         default:\r
                                             b[m]=p+color+32; // assume non-virgin\r
+                                           if(color==BLACK && m<0x10 && p==oo[m+16] || // but make virgin on original square\r
+                                               color==WHITE && m>0x6F && p==oo[m-0x70]) b[m] -= 32;\r
                                             if(w[p]<0) { // Royal piece on original square: virgin\r
-                                               if(color==BLACK && m<0x10 && p==oo[m+16] ||\r
-                                                   color==WHITE && m>0x6F && p==oo[m-0x70]) b[m] -= 32;\r
                                                 Q-=w[p]; // assume value was flipped to indicate royalty\r
                                                 if(pl[p+color])R-=w[p]/FAC; // capturable King, add to material\r
                                            } else { Q+=w[p]; R+=w[p]/FAC; }\r
-                                            if((m==0x00 || m==BW-1   ) && color==BLACK && p==oo[m+16] ||\r
-                                               (m==0x70 || m==0x6F+BW) && color==WHITE && p==oo[m-0x70])\r
-                                                b[m] &= ~32; // corner piece as in original setup: virgin\r
                                        case 0: // undefined piece, ignore\r
                                             break;\r
                                         }\r