X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=moves.c;h=75772a44e1bc8ce51b34e0a23de4877fac537ab2;hb=f1ff4bfff317168f2821e67ab6ee41c6eaa16efe;hp=88bbdee9706d05cc9d2445c21cb83f78064d811e;hpb=17d5e197ff197599a155a56cf2adaca266774a48;p=xboard.git

diff --git a/moves.c b/moves.c
index 88bbdee..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
@@ -2031,7 +2044,7 @@ Disambiguate (Board board, int flags, DisambiguateClosure *closure)
         GenLegal(board, flags|F_IGNORE_CHECK, DisambiguateCallback, (VOIDSTAR) closure, closure->pieceIn);
 	if (closure->count == 0) {
 	    /* No, it's not even that */
-	  if(!appData.testLegality && closure->pieceIn != EmptySquare) {
+	  if(!appData.testLegality && !pieceDefs && closure->pieceIn != EmptySquare) {
 	    int f, r; // if there is only a single piece of the requested type on the board, use that
 	    closure->rt = closure->rtIn, closure->ft = closure->ftIn;
 	    for(r=0; r<BOARD_HEIGHT; r++) for(f=BOARD_LEFT; f<BOARD_RGHT; f++)