X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=moves.c;h=1e9ba9e91f65492e55b94a8085e6502f996d8ea1;hb=7949d2168ee377694b645dc909f3cb93039588ee;hp=e560d34cd220328a637ce78dc6c027d4868ebad7;hpb=ba12e63149a003b88b8525d6eb50d48539c660b6;p=xboard.git

diff --git a/moves.c b/moves.c
index e560d34..1e9ba9e 100644
--- a/moves.c
+++ b/moves.c
@@ -5,7 +5,7 @@
  * Massachusetts.
  *
  * Enhancements Copyright 1992-2001, 2002, 2003, 2004, 2005, 2006,
- * 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
+ * 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Free Software Foundation, Inc.
  *
  * Enhancements Copyright 2005 Alessandro Scotti
  *
@@ -408,8 +408,8 @@ MovesFromString (Board board, int flags, int f, int r, int tx, int ty, int angle
 		if(y < 0 || y >= BOARD_HEIGHT) break; // vertically off-board: always done
 		if(x <  BOARD_LEFT) { if(mode & 128) x += BOARD_RGHT - BOARD_LEFT, loop++; else break; }
 		if(x >= BOARD_RGHT) { if(mode & 128) x -= BOARD_RGHT - BOARD_LEFT, loop++; else break; }
-		if(board[y][x] == DarkSquare) break;  // black squares are supposed to be off board
 		if(j) { j--; continue; }              // skip irrespective of occupation
+		if(board[y][x] == DarkSquare) break;  // black squares are supposed to be off board
 		if(!jump    && board[y - vy + vy/2][x - vx + vx/2] != EmptySquare) break; // blocked
 		if(jump > 1 && board[y - vy + vy/2][x - vx + vx/2] == EmptySquare) break; // no hop
 		if(x == f && y == r && !loop) occup = 4;     else // start square counts as empty (if not around cylinder!)
@@ -1673,10 +1673,11 @@ CheckTest (Board board, int flags, int rf, int ff, int rt, int ft, int enPassant
 	}
 	ep = board[EP_STATUS];
 	if( captured == WhiteLion || captured == BlackLion ) { // [HGM] lion: Chu Lion-capture rules
-	    ChessSquare victim = killX < 0 ? EmptySquare : trampled;
+	    ChessSquare victim = saveKill < 0 ? EmptySquare : trampled;
 	    if( (board[rt][ft] == WhiteLion || board[rt][ft] == BlackLion) &&           // capturer is Lion
 		(ff - ft > 1 || ft - ff > 1 || rf - rt > 1 || rt - rf > 1) &&           // captures from a distance
-		(victim == EmptySquare || victim == WhitePawn || victim == BlackPawn) ) // no or worthless 'bridge'
+		(victim == EmptySquare || victim == WhitePawn || victim == BlackPawn    // no or worthless 'bridge'
+				     || victim == WhiteCobra || victim == BlackCobra) ) // (Pawn or Go Between)
 		     board[EP_STATUS] = EP_ROYAL_LION; // on distant Lion x Lion victim must not be pseudo-legally protected
 	}
     }