X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=moves.c;h=fa9a8cc22191359ae15f5c10c24a66fdd1d44802;hb=34c0d135d701dbb3e5c3c2298fcb0db8e77bebef;hp=b6547cbd75d741a43b111829a56d8577f2c6aefa;hpb=c38564ef8fe195f46f162be88bf53803d6a0df2f;p=xboard.git

diff --git a/moves.c b/moves.c
index b6547cb..fa9a8cc 100644
--- a/moves.c
+++ b/moves.c
@@ -432,9 +432,9 @@ MovesFromString (Board board, int flags, int f, int r, int tx, int ty, int angle
 		if(mode & 1024) {            // castling
 		    i = 2;                   // kludge to elongate move indefinitely
 		    if(occup == 4) continue; // skip empty squares
-		    if(x == BOARD_LEFT   && board[y][x] == initialPosition[y][x]) // reached initial corner piece
+		    if((x == BOARD_LEFT || vx < 0 && board[y][x-1] == DarkSquare)  && board[y][x] == initialPosition[y][x]) // reached initial corner piece
 			cb(board, flags, mine == 1 ? WhiteQueenSideCastle : BlackQueenSideCastle, r, f, y, f - expo, cl);
-		    if(x == BOARD_RGHT-1 && board[y][x] == initialPosition[y][x])
+		    if((x == BOARD_RGHT-1 || vx > 0 && board[y][x+1] == DarkSquare) && board[y][x] == initialPosition[y][x])
 			cb(board, flags, mine == 1 ? WhiteKingSideCastle : BlackKingSideCastle, r, f, y, f + expo, cl);
 		    break;
 		}