From: H.G.Muller <hgm@hgm-xboard.(none)>
Date: Sun, 17 Jul 2016 21:06:19 +0000 (+0200)
Subject: Fix King leaving Palace in Xiangqi
X-Git-Url: http://winboard.nl/cgi-bin?p=xboard.git;a=commitdiff_plain;h=7cd0052b1919644b72b23993328bfc542a8525d3

Fix King leaving Palace in Xiangqi

The rewrite of the move generator had overlooked this.
---

diff --git a/moves.c b/moves.c
index 6a747a2..91f0072 100644
--- a/moves.c
+++ b/moves.c
@@ -986,6 +986,14 @@ GenPseudoLegal (Board board, int flags, MoveCallback callback, VOIDSTAR closure,
 
             case WhiteWazir:
             case BlackWazir:
+		if(gameInfo.variant == VariantXiangqi) {
+		    int palace = (piece == WhiteWazir ? 1 : BOARD_HEIGHT-2); // Palace center
+		    if(ff <= BOARD_WIDTH/2 && !SameColor(board[rf][ff+1], piece)) callback(board, flags, NormalMove, rf, ff, rf, ff+1, closure);
+		    if(ff >= BOARD_WIDTH/2 && !SameColor(board[rf][ff-1], piece)) callback(board, flags, NormalMove, rf, ff, rf, ff-1, closure);
+		    if(rf >= palace && !SameColor(board[rf-1][ff], piece)) callback(board, flags, NormalMove, rf, ff, rf-1, ff, closure);
+		    if(rf <= palace && !SameColor(board[rf+1][ff], piece)) callback(board, flags, NormalMove, rf, ff, rf+1, ff, closure);
+		    break;
+		}
 		Wazir(board, flags, rf, ff, callback, closure);
 		break;