X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=ec17e4745b0ba03e4a4c31122642c933cdef2b4d;hb=686be7b1d12f8c2b3ad58430c1c79093a7652065;hp=50102ca4326c0d812987dcb5dea1c02ef9c2cb9b;hpb=b2918562aae79be5117ea7e9e01af1ad17afbd97;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index 50102ca..ec17e47 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -2459,7 +2459,7 @@ InitDrawingSizes(BoardSize boardSize, int flags)
   pieceBitmap[2][WhiteBishop] = DoLoadBitmap(hInst, "b", squareSize, "w");
   pieceBitmap[2][WhiteRook] = DoLoadBitmap(hInst, "r", squareSize, "w");
   pieceBitmap[2][WhiteKing] = DoLoadBitmap(hInst, "k", squareSize, "w");
-  if( gameInfo.variant == VariantShogi && (squareSize==72 || squareSize==49)) {
+  if( gameInfo.variant == VariantShogi && squareSize <= 72 && squareSize >= 33) {
     // in Shogi, Hijack the unused Queen for Lance
     pieceBitmap[0][WhiteQueen] = DoLoadBitmap(hInst, "l", squareSize, "s");
     pieceBitmap[1][WhiteQueen] = DoLoadBitmap(hInst, "l", squareSize, "o");
@@ -4073,6 +4073,8 @@ MouseEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
     x = BOARD_WIDTH - 1 - x;
   }
 
+  shiftKey = GetKeyState(VK_SHIFT) < 0; // [HGM] remember last shift status
+
   switch (message) {
   case WM_LBUTTONDOWN:
       if (PtInRect((LPRECT) &whiteRect, pt)) {
@@ -6365,7 +6367,8 @@ TypeInMoveDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 
   case WM_COMMAND:
     switch (LOWORD(wParam)) {
-    case IDOK:
+    case IDOK:
+      shiftKey = GetKeyState(VK_SHIFT) < 0; // [HGM] remember last shift status
       GetDlgItemText(hDlg, OPT_Move, move, sizeof(move));
       { int n; Board board;
 	// [HGM] FENedit