X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=moves.c;h=867a94061a9c5938caf23f815bcd61096bb8ca5d;hb=ebd7f78161504e46896f7d96bb41e29714b2fd53;hp=0b6b9b44c87376841c67cbaa6702b2f376f636f0;hpb=9efb2d38d555f7ca5d0666246f789979d9d4115e;p=xboard.git

diff --git a/moves.c b/moves.c
index 0b6b9b4..867a940 100644
--- a/moves.c
+++ b/moves.c
@@ -5,7 +5,8 @@
  * Massachusetts.
  *
  * Enhancements Copyright 1992-2001, 2002, 2003, 2004, 2005, 2006,
- * 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Free Software Foundation, Inc.
+ * 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Free
+ * Software Foundation, Inc.
  *
  * Enhancements Copyright 2005 Alessandro Scotti
  *
@@ -126,7 +127,7 @@ char
 PieceToChar (ChessSquare p)
 {
     int c;
-    if((int)p < 0 || (int)p >= (int)EmptySquare) return('x'); /* [HGM] for safety */
+    if((int)p < 0 || (int)p >= (int)EmptySquare) return('?'); /* [HGM] for safety */
     c = pieceToChar[(int) p];
     if(c & 128) c = c & 63 | 64;
     return c;
@@ -256,7 +257,7 @@ LoadPieceDesc (char *s)
 	    if(pieceToChar[piece] != '+') { ok = FALSE; continue; } // promoted form does not exist
 	}
 	ASSIGN(pieceDesc[piece], p);
-	if(piece < BlackPawn && (pieceToChar[WHITE_TO_BLACK piece] == pieceToChar[piece] || promoted)) {
+	if(piece < BlackPawn && (pieceToChar[WHITE_TO_BLACK piece] == pieceToChar[piece] + 32 || promoted)) {
 	    ASSIGN(pieceDesc[WHITE_TO_BLACK piece], p);
 	}
 	pieceDefs = TRUE;