X-Git-Url: http://winboard.nl/cgi-bin?p=xboard.git;a=blobdiff_plain;f=backend.c;h=23bfda78129c49eb2751fc91b36e993caa96cb7d;hp=55cb25364cc37d5ffc4048596fd5beb86f29884e;hb=1fd133e6b9a69f8e2e32a5cad04bfc9930db9ee4;hpb=0fe341b64ac865097b5182ec7740fe18802efbd2

diff --git a/backend.c b/backend.c
index 55cb253..23bfda7 100644
--- a/backend.c
+++ b/backend.c
@@ -5162,14 +5162,14 @@ SendMoveToProgram (int moveNum, ChessProgramState *cps)
       if(moveList[moveNum][4] == ';') { // [HGM] lion: move is double-step over intermediate square
 	char *m = moveList[moveNum];
 	static char c[2];
-	*c = m[7]; // promoChar
+	*c = m[7]; if(*c == '\n') *c = NULLCHAR; // promoChar
 	if((boards[moveNum][m[6]-ONE][m[5]-AAA] < BlackPawn) == (boards[moveNum][m[1]-ONE][m[0]-AAA] < BlackPawn)) // move is kludge to indicate castling
 	  snprintf(buf, MSG_SIZ, "%c%d%c%d,%c%d%c%d\n", m[0], m[1] - '0', // convert to two moves
 					       m[2], m[3] - '0',
 					       m[5], m[6] - '0',
 					       m[2] + (m[0] > m[5] ? 1 : -1), m[3] - '0');
 	else if(*c && m[8]) { // kill square followed by 2 characters: 2nd kill square rather than promo suffix
-	  *c = m[9];
+	  *c = m[9]; if(*c == '\n') *c = NULLCHAR;
 	  snprintf(buf, MSG_SIZ, "%c%d%c%d,%c%d%c%d,%c%d%c%d%s\n", m[0], m[1] - '0', // convert to three moves
 					       m[7], m[8] - '0',
 					       m[7], m[8] - '0',
@@ -7915,6 +7915,7 @@ LeftClick (ClickType clickType, int xPix, int yPix)
 	    DisplayMessage("Click in holdings to choose piece", "");
 	    return;
 	}
+	DrawPosition(FALSE, NULL); // shows piece on from-square during promo popup
 	PromotionPopUp(promoChoice);
     } else {
 	int oldMove = currentMove;
@@ -9145,10 +9146,10 @@ FakeBookMove: // [HGM] book: we jump here to simulate machine moves after book h
     }
     if(sscanf(message, "piece %s %s", buf2, buf1) == 2) {
       ChessSquare piece = WhitePawn;
-      char *p=message+6, *q, *s = SUFFIXES, ID = *p;
-      if(*p == '+') piece = CHUPROMOTED(WhitePawn), ID = *++p;
+      char *p=message+6, *q, *s = SUFFIXES, ID = *p, promoted = 0;
+      if(*p == '+') promoted++, ID = *++p;
       if(q = strchr(s, p[1])) ID += 64*(q - s + 1), p++;
-      piece += CharToPiece(ID & 255) - WhitePawn;
+      piece = CharToPiece(ID & 255); if(promoted) piece = CHUPROMOTED(piece);
       if(cps != &first || appData.testLegality && *engineVariant == NULLCHAR
       /* always accept definition of  */       && piece != WhiteFalcon && piece != BlackFalcon
       /* wild-card pieces.            */       && piece != WhiteCobra  && piece != BlackCobra