X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=43dfeeda52bbb061b40d399347458a5c22b1e8c6;hb=f0fa0b3b5570ba67f4a83101fe24f5504fb21012;hp=3178807e4fd3a56ac9e0f8a80b7ef6c1d1297076;hpb=30c1dcad0772e901bc944d3d7cf17db4f2a10fa0;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index 3178807..43dfeed 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -4299,6 +4299,7 @@ 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 */
@@ -4346,9 +4347,11 @@ Promotion(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       break;
     case PB_Rook:
       promoChar = ToLower(PieceToChar(WhiteOnMove(currentMove) ? WhiteRook : BlackRook));
+      if(gameInfo.variant == VariantSpartan && !WhiteOnMove(currentMove)) promoChar = PieceToChar(BlackDragon);
       break;
     case PB_Bishop:
       promoChar = ToLower(PieceToChar(WhiteOnMove(currentMove) ? WhiteBishop : BlackBishop));
+      if(gameInfo.variant == VariantSpartan && !WhiteOnMove(currentMove)) promoChar = PieceToChar(BlackAlfil);
       break;
     case PB_Chancellor:
       promoChar = ToLower(PieceToChar(WhiteOnMove(currentMove) ? WhiteMarshall : BlackMarshall));
@@ -6872,6 +6875,7 @@ ConsoleTextSubclass(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
   switch (message) {
   case WM_KEYDOWN:
     if (!(GetKeyState(VK_CONTROL) & ~1)) break;
+    if(wParam=='R') return 0;
     switch (wParam) {
     case VK_PRIOR:
       SendMessage(hwnd, EM_LINESCROLL, 0, -999999);