X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=moves.c;h=52b609c0899c596b770fa3a730bd84358fea8479;hb=ef62f9528016f12b917f859f7021311445172458;hp=fa41620624525080c8bb99497b8dc951af4dfee8;hpb=69ce008d53a3c2fe16f7522b2c2dc7957fb5ea13;p=xboard.git

diff --git a/moves.c b/moves.c
index fa41620..52b609c 100644
--- a/moves.c
+++ b/moves.c
@@ -1310,6 +1310,15 @@ CheckTest (Board board, int flags, int rf, int ff, int rt, int ft, int enPassant
         king = flags & F_WHITE_ON_MOVE ? WhiteWazir : BlackWazir;
     if(gameInfo.variant == VariantKnightmate)
         king = flags & F_WHITE_ON_MOVE ? WhiteUnicorn : BlackUnicorn;
+    if(gameInfo.variant == VariantChu) { // strictly speaking this is not needed, as Chu officially has no check
+	int r, f, k = king, royals=0, prince = flags & F_WHITE_ON_MOVE ? WhiteMonarch : BlackMonarch;
+	for(r=0; r<BOARD_HEIGHT; r++) for(f=BOARD_LEFT; f<BOARD_RGHT; f++) {
+	    if(board[r][f] == k || board[r][f] == prince) {
+		if(++royals > 1) return FALSE; // no check if we have two royals (ignores double captureby Lion!)
+		king = board[r][f]; // remember hich one we had
+	    }
+	}
+    }
 
     if (rt >= 0) {
 	if (enPassant) {
@@ -1618,7 +1627,7 @@ MateTest (Board board, int flags)
 	else if(gameInfo.variant == VariantGiveaway) return MT_STEALMATE; // no check exists, stalemated = win
 
         return inCheck ? MT_CHECKMATE
-		       : (gameInfo.variant == VariantXiangqi || gameInfo.variant == VariantShatranj || gameInfo.variant == VariantShogi) ?
+		       : (gameInfo.variant == VariantXiangqi || gameInfo.variant == VariantShatranj || IS_SHOGI(gameInfo.variant)) ?
 			  MT_STAINMATE : MT_STALEMATE;
     }
 }