X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=moves.c;h=054ee6b746da277cb44b1ea0eb5a73aff6c1ede7;hb=c5f9e4b9c745527e59d5b192d62f68b6db5fdf00;hp=e3afe3640a30935beded074b175423e86dc85ac6;hpb=e062b785843eb72f96d20771bc2e5693f7d4278f;p=xboard.git

diff --git a/moves.c b/moves.c
index e3afe36..054ee6b 100644
--- a/moves.c
+++ b/moves.c
@@ -247,9 +247,11 @@ MovesFromString (Board board, int flags, int f, int r, char *desc, MoveCallback
 	if(*desc == 'c') mode |= his, desc++;
 	if(*desc == 'd') mode |= mine, desc++;
 	if(*desc == 'e') mode |= 8, desc++;
+	if(!mode) mode = his + 4;// no mode spec, use default = mc
+	if(*desc == 'p') mode |= 32, desc++;
+	if(*desc == 'g') mode |= 64, desc++;
 	if(*desc == 'n') jump = 0, desc++;
 	while(*desc == 'j') jump++, desc++;
-	if(!mode) mode = his + 4;// no mode spec, use default = mc
 	dx = xStep[*p-'A'] - '0';                     // step vector of atom
 	dy = yStep[*p-'A'] - '0';
 	if(isdigit(*++p)) expo = atoi(p++);           // read exponent
@@ -261,7 +263,7 @@ MovesFromString (Board board, int flags, int f, int r, char *desc, MoveCallback
 	}
         do {
 	  for(dir=0, bit=1; dir<8; dir++, bit += bit) { // loop over directions
-	    int i = expo, vx, vy;
+	    int i = expo, hop = mode, vx, vy;
 	    if(!(bit & dirSet)) continue;             // does not move in this direction
 	    vx = dx*rot[dir][0] + dy*rot[dir][1];     // rotate step vector
 	    vy = dx*rot[dir][2] + dy*rot[dir][3];
@@ -274,6 +276,7 @@ MovesFromString (Board board, int flags, int f, int r, char *desc, MoveCallback
 		if(board[y][x] < BlackPawn)   occup = 1; else
 		if(board[y][x] < EmptySquare) occup = 2; else
 					      occup = 4;
+		if(hop & 32+64) { if(occup != 4) { if(hop & 64 && i != 1) i = 2; hop &= 31; } continue; } // hopper
 		if(mode & 8 && y == board[EP_RANK] && occup == 4 && board[EP_FILE] == x) { // to e.p. square
 		    cb(board, flags, mine == 1 ? WhiteCapturesEnPassant : BlackCapturesEnPassant, r, f, y, x, cl);
 		}