X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=fairymax.c;h=35d785b93383c2ebc5a79aff0815fcbd3208117c;hb=165248b746cab04ad07b3a84056097eb676c5682;hp=d02f86a896fcb493ad58a5e1faef2368e767a327;hpb=ac213a6bde534721fbea5d1cb0c8bf377238edce;p=fairymax.git

diff --git a/fairymax.c b/fairymax.c
index d02f86a..35d785b 100644
--- a/fairymax.c
+++ b/fairymax.c
@@ -101,7 +101,7 @@ char *inifile = INI_FILE;
 int Ticks, tlim, Setup, SetupQ;
 
 int GameHistory[1024];
-char HistoryBoards[1024][STATE], setupPosition[131];
+char HistoryBoards[1024][STATE], setupPosition[162];
 int GamePtr, HistPtr;
 
 #define W while
@@ -119,7 +119,7 @@ oo[32],                                        /* initial piece setup      */
 of[256],
 od[16];                                        /* 1st dir. in o[] per piece*/
 
-signed char L,pl[17],
+signed char L,pl[32],
 b[513],                                        /* board: 16x8+dummy, + PST */
 T[4104],                                       /* hash translation table   */
 centr[32],
@@ -248,7 +248,7 @@ int k,q,l,e,E,z,n;      /* (q,l)=window, e=current eval. score, E=e.p. sqr.*/
          ((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*/
-      else F=y;                                /* enable e.p.              */
+      else if(flag&64)t=flag&128?0:t,flag&=63;else F=y; /* enable e.p.     */
       if(s&&flag&8)t=0,flag^=flag>>4&15;       /* hoppers go to next phase */
       if(!(flag&S))                            /* zig-zag piece?           */
        r=v,flag^=flag>>4&15;                   /* alternate vector & mode  */
@@ -735,9 +735,9 @@ int main(int argc, char **argv)
                         InitGame();
 			if(Setup) {
 			    for(i=0; i<128; i++) b[i] = setupPosition[i];
+			    for(i=0; i<32; i++) pl[i] = setupPosition[i+130];
 			    Side = setupPosition[128]; Q = SetupQ;
-			    pl[WHITE] = setupPosition[129];
-			    pl[BLACK] = setupPosition[130];
+			    R = setupPosition[129];
 			}
 			for(i=0; i<=U; i++) A[i].D = A[i].K = 0; // clear hash table
                         for(nr=0; nr<GamePtr; nr++) {
@@ -812,8 +812,8 @@ int main(int argc, char **argv)
 			GamePtr = HistPtr = 0; Setup = 1; SetupQ = Q; // start anew
 			for(i=0; i<128; i++) setupPosition[i] = b[i]; // remember position
 			setupPosition[128] = Side;
-			setupPosition[129] = pl[WHITE];
-			setupPosition[130] = pl[BLACK];
+			setupPosition[129] = R;
+			for(i=0; i<32; i++) setupPosition[i+130] = pl[i];
 			continue;
 		}
                 /* command not recognized, assume input move */