X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=0b4ad8436f32fe3a936504155cefa796d8192278;hb=15caae7fbe25f432679e809259a5bf57536a3f6a;hp=552935e419fd24cb7a3f9ff0fbc54a35b4704684;hpb=7e2a06ad31bcd1cd5eb1d5c5c2ef2267d409b27c;p=xboard.git

diff --git a/backend.c b/backend.c
index 552935e..0b4ad84 100644
--- a/backend.c
+++ b/backend.c
@@ -6948,7 +6948,7 @@ UserMoveEvent(int fromX, int fromY, int toX, int toY, int promoChar)
 	/* EditPosition, empty square, or different color piece;
 	   click-click move is possible */
 	if (toX == -2 || toY == -2) {
-	    boards[0][fromY][fromX] = EmptySquare;
+	    boards[0][fromY][fromX] = (boards[0][fromY][fromX] == EmptySquare ? DarkSquare : EmptySquare);
 	    DrawPosition(FALSE, boards[currentMove]);
 	    return;
 	} else if (toX >= 0 && toY >= 0) {
@@ -7323,8 +7323,8 @@ CanPromote (ChessSquare piece, int y)
          gameInfo.variant == VariantMakruk   || gameInfo.variant == VariantASEAN) return FALSE;
 	return (piece == BlackPawn && y <= zone ||
 		piece == WhitePawn && y >= BOARD_HEIGHT-1-zone ||
-		piece == BlackLance && y == 1 ||
-		piece == WhiteLance && y == BOARD_HEIGHT-2 );
+		piece == BlackLance && y <= zone ||
+		piece == WhiteLance && y >= BOARD_HEIGHT-1-zone );
 }
 
 void
@@ -15121,7 +15121,7 @@ EditPositionMenuEvent (ChessSquare selection, int x, int y)
                                     AAA + x, ONE + y);
 			    SendToICS(buf);
 			}
-		    } else {
+		    } else if(boards[0][y][x] != DarkSquare) {
 			if(boards[0][y][x] != p) nonEmpty++;
 			boards[0][y][x] = p;
 		    }