X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=773c4b9244e2f1cf47b586ce7fca147292c145c9;hb=564d40aef12b1927f48cf1561ec3199462f8e583;hp=2f15610f8c9db3bcd504d9190fb3909d5565a686;hpb=111a53cef5b0232673e996261d9b2bffecb17c6c;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index 2f15610..773c4b9 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -4299,19 +4299,20 @@ Promotion(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
     Translate(hDlg, DLG_PromotionKing);
     ShowWindow(GetDlgItem(hDlg, PB_King), 
       (!appData.testLegality || gameInfo.variant == VariantSuicide ||
+       gameInfo.variant == VariantSpartan && !WhiteOnMove(currentMove) ||
        gameInfo.variant == VariantGiveaway || gameInfo.variant == VariantSuper ) ?
 	       SW_SHOW : SW_HIDE);
     /* [HGM] Only allow C & A promotions if these pieces are defined */
     ShowWindow(GetDlgItem(hDlg, PB_Archbishop),
-       ((PieceToChar(WhiteAngel) >= 'A' &&
+       ((PieceToChar(WhiteAngel) >= 'A' && WhiteOnMove(currentMove) &&
          PieceToChar(WhiteAngel) != '~') ||
-        (PieceToChar(BlackAngel) >= 'A' &&
+        (PieceToChar(BlackAngel) >= 'A' && !WhiteOnMove(currentMove) &&
          PieceToChar(BlackAngel) != '~')   ) ?
 	       SW_SHOW : SW_HIDE);
     ShowWindow(GetDlgItem(hDlg, PB_Chancellor), 
-       ((PieceToChar(WhiteMarshall) >= 'A' &&
+       ((PieceToChar(WhiteMarshall) >= 'A' && WhiteOnMove(currentMove) &&
          PieceToChar(WhiteMarshall) != '~') ||
-        (PieceToChar(BlackMarshall) >= 'A' &&
+        (PieceToChar(BlackMarshall) >= 'A' && !WhiteOnMove(currentMove) &&
          PieceToChar(BlackMarshall) != '~')   ) ?
 	       SW_SHOW : SW_HIDE);
     /* [HGM] Hide B & R button in Shogi, use Q as promote, N as defer */
@@ -4342,31 +4343,30 @@ Promotion(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       promoChar = gameInfo.variant == VariantSuper ? PieceToChar(BlackSilver) : PieceToChar(BlackKing);
       break;
     case PB_Queen:
-      promoChar = gameInfo.variant == VariantShogi ? '+' : PieceToChar(BlackQueen);
+      promoChar = gameInfo.variant == VariantShogi ? '+' : ToLower(PieceToChar(WhiteOnMove(currentMove) ? WhiteQueen : BlackQueen));
       break;
     case PB_Rook:
-      promoChar = PieceToChar(BlackRook);
+      promoChar = ToLower(PieceToChar(WhiteOnMove(currentMove) ? WhiteRook : BlackRook));
+      if(gameInfo.variant == VariantSpartan && !WhiteOnMove(currentMove)) promoChar = PieceToChar(BlackDragon);
       break;
     case PB_Bishop:
-      promoChar = PieceToChar(BlackBishop);
+      promoChar = ToLower(PieceToChar(WhiteOnMove(currentMove) ? WhiteBishop : BlackBishop));
+      if(gameInfo.variant == VariantSpartan && !WhiteOnMove(currentMove)) promoChar = PieceToChar(BlackAlfil);
       break;
     case PB_Chancellor:
-      promoChar = PieceToChar(BlackMarshall);
+      promoChar = ToLower(PieceToChar(WhiteOnMove(currentMove) ? WhiteMarshall : BlackMarshall));
       break;
     case PB_Archbishop:
-      promoChar = PieceToChar(BlackAngel);
+      promoChar = ToLower(PieceToChar(WhiteOnMove(currentMove) ? WhiteAngel : BlackAngel));
       break;
     case PB_Knight:
-      promoChar = gameInfo.variant == VariantShogi ? '=' : PieceToChar(BlackKnight);
+      promoChar = gameInfo.variant == VariantShogi ? '=' : PieceToChar(WhiteOnMove(currentMove) ? WhiteKnight : BlackKnight);
       break;
     default:
       return FALSE;
     }
+    if(promoChar == '.') return FALSE; // invalid piece chosen 
     EndDialog(hDlg, TRUE); /* Exit the dialog */
-    /* [HGM] <popupFix> Call FinishMove rather than UserMoveEvent, as we
-       only show the popup when we are already sure the move is valid or
-       legal. We pass a faulty move type, but the kludge is that FinishMove
-       will figure out it is a promotion from the promoChar. */
     UserMoveEvent(fromX, fromY, toX, toY, promoChar);
     fromX = fromY = -1;
     if (!appData.highlightLastMove) {