X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=moves.c;h=75772a44e1bc8ce51b34e0a23de4877fac537ab2;hb=63c29de9cd551a135ae1bf7a6fb7322ee7119d9f;hp=5c265a690332ada9d2199df18b96a14904346b5d;hpb=e65b07bd75a88d89a99ca9709ea5eb987cc9ecb1;p=xboard.git

diff --git a/moves.c b/moves.c
index 5c265a6..75772a4 100644
--- a/moves.c
+++ b/moves.c
@@ -1973,6 +1973,7 @@ DisambiguateCallback (Board board, int flags, ChessMove kind, int rf, int ff, in
 {
     register DisambiguateClosure *cl = (DisambiguateClosure *) closure;
     int wildCard = FALSE; ChessSquare piece = board[rf][ff];
+    extern int kifu; // in parser.c
 
     // [HGM] wild: for wild-card pieces rt and rf are dummies
     if(piece == WhiteFalcon || piece == BlackFalcon ||
@@ -1990,6 +1991,18 @@ DisambiguateCallback (Board board, int flags, ChessMove kind, int rf, int ff, in
 
 	if(cl->count && rf == cl->rf && ff == cl->ff) return; // duplicate move
 
+	if(cl->count == 1 && kifu & 0x7E && cl->rfIn == -1 && cl->ffIn == -1) { // traditional Shogi disambiguation required
+	    int this = 1, other = 1;
+	    if(kifu & 2) this &= (flags & 1 ? rt > rf : rt < rf), other &= (flags & 1 ? cl->rt > cl->rf : cl->rt < cl->rf);
+	    if(kifu & 4) this &= (flags & 1 ? rt < rf : rt > rf), other &= (flags & 1 ? cl->rt < cl->rf : cl->rt > cl->rf);
+	    if(kifu & 8) this &= (rf == rt), other &= (cl->rt == cl->rf);
+	    if(kifu & 0x10) this &= (flags & 1 ? ft <= ff : ft >= ff), other &= (flags & 1 ? cl->ft <= cl->ff : cl->ft >= cl->ff);
+	    if(kifu & 0x20) this &= (flags & 1 ? ft >= ff : ft <= ff), other &= (flags & 1 ? cl->ft >= cl->ff : cl->ft <= cl->ff);
+	    if(kifu & 0x40) this &= (ft == ff), other &= (cl->ft == cl->ff); // should never be used
+	    if(!other) cl->count--; // the old move did not satisfy the requested relative position, erase it
+	    if(!this) return;       // the current move does not satisfy the requested relative position, ignore it
+	}
+
 	cl->count++;
 	if(cl->count == 1 || board[rt][ft] != EmptySquare) {
 	  // [HGM] oneclick: if multiple moves, be sure we remember capture