X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=f818927530ee9bafe77cd8595e99ba2b3ceb9d9a;hb=eb0b8eabe5bf8d5139bc82bf79b88aded98d96c8;hp=84f38fb1ef3f34e5c011086d6f23f3c3c00cfe60;hpb=857449ff285e17ae5dcce9325d516616d9b629a2;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index 84f38fb..f818927 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -105,7 +105,6 @@ void DisplayHoldingsCount(HDC hdc, int x, int y, int align, int copyNumber);
 VOID NewVariantPopup(HWND hwnd);
 int FinishMove P((ChessMove moveType, int fromX, int fromY, int toX, int toY,
 		   /*char*/int promoChar));
-void AnimateAtomicCapture(int fromX, int fromY, int toX, int toY, int nFrames);
 void DisplayMove P((int moveNumber));
 Boolean ParseFEN P((Board board, int *blackPlaysFirst, char *fen));
 void ChatPopUp P((char *s));
@@ -383,7 +382,7 @@ T_(char *s)
 {   // return the translation of the given string
     // efficiency can be improved a lot...
     int i=0;
-if(appData.debugMode) fprintf(debugFP, "T_(%s)\n", s);
+//if(appData.debugMode) fprintf(debugFP, "T_(%s)\n", s);
     if(!barbaric) return s;
     if(!s) return ""; // sanity
     while(english[i]) {
@@ -404,7 +403,7 @@ Translate(HWND hDlg, int dialogID)
     if(dialogItems[i][0] != dialogID) return; // unknown dialog, should not happen
     GetWindowText( hDlg, buf, MSG_SIZ );
     s = T_(buf);
-if(appData.debugMode) fprintf(debugFP, "WindowText '%s' -> '%s'\n", buf, s);
+//if(appData.debugMode) fprintf(debugFP, "WindowText '%s' -> '%s'\n", buf, s);
     if(strcmp(buf, s)) SetWindowText(hDlg, s); // replace by translated string (if different)
     for(j=1; k=dialogItems[i][j]; j++) { // translate all listed dialog items
         GetDlgItemText(hDlg, k, buf, MSG_SIZ);
@@ -2459,7 +2458,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( !strcmp(appData.variant, "shogi") && (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");
@@ -3667,6 +3666,7 @@ HDCDrawPosition(HDC hdc, BOOLEAN repaint, Board board)
   if(explodeInfo.radius) { // [HGM] atomic
 	HBRUSH oldBrush;
 	int x, y, r=(explodeInfo.radius * squareSize)/100;
+        ChessSquare piece = board[explodeInfo.fromY][explodeInfo.fromX];
         board[explodeInfo.fromY][explodeInfo.fromX] = EmptySquare; // suppress display of capturer
 	SquareToPos(explodeInfo.toY, explodeInfo.toX, &x, &y);
 	x += squareSize/2;
@@ -3679,6 +3679,7 @@ HDCDrawPosition(HDC hdc, BOOLEAN repaint, Board board)
 	DrawHighlightsOnDC(hdcmem, &highlightInfo, HIGHLIGHT_PEN);
 	DrawHighlightsOnDC(hdcmem, &premoveHighlightInfo, PREMOVE_PEN);
 	DrawBoardOnDC(hdcmem, board, tmphdc);
+        board[explodeInfo.fromY][explodeInfo.fromX] = piece;
 	oldBrush = SelectObject(hdcmem, explodeBrush);
 	Ellipse(hdcmem, x-r, y-r, x+r, y+r);
 	SelectObject(hdcmem, oldBrush);
@@ -4073,6 +4074,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 +6368,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
@@ -9613,26 +9617,26 @@ static void Tween( POINT * start, POINT * mid, POINT * finish, int factor,
      POINT frames[], int * nFrames);
 
 
+#define kFactor 4
+
 void
-AnimateAtomicCapture(int fromX, int fromY, int toX, int toY, int nFrames)
+AnimateAtomicCapture(Board board, int fromX, int fromY, int toX, int toY)
 {	// [HGM] atomic: animate blast wave
 	int i;
-if(appData.debugMode) fprintf(debugFP, "exploding (%d,%d)\n", toX, toY);
+
 	explodeInfo.fromX = fromX;
 	explodeInfo.fromY = fromY;
 	explodeInfo.toX = toX;
 	explodeInfo.toY = toY;
-	for(i=1; i<nFrames; i++) {
-	    explodeInfo.radius = (i*180)/(nFrames-1);
-	    DrawPosition(FALSE, NULL);
+	for(i=1; i<4*kFactor; i++) {
+	    explodeInfo.radius = (i*180)/(4*kFactor-1);
+	    DrawPosition(FALSE, board);
 	    Sleep(appData.animSpeed);
 	}
 	explodeInfo.radius = 0;
-	DrawPosition(TRUE, NULL);
+	DrawPosition(TRUE, board);
 }
 
-#define kFactor 4
-
 void
 AnimateMove(board, fromX, fromY, toX, toY)
      Board board;
@@ -9655,17 +9659,17 @@ AnimateMove(board, fromX, fromY, toX, toY)
   ScreenSquare(fromX, fromY, &start);
   ScreenSquare(toX, toY, &finish);
 
-  /* All pieces except knights move in straight line */
-  if (piece != WhiteKnight && piece != BlackKnight) {
+  /* All moves except knight jumps move in straight line */
+  if (!(abs(fromX-toX) == 1 && abs(fromY-toY) == 2 || abs(fromX-toX) == 2 && abs(fromY-toY) == 1)) {
     mid.x = start.x + (finish.x - start.x) / 2;
     mid.y = start.y + (finish.y - start.y) / 2;
   } else {
-    /* Knight: make diagonal movement then straight */
+    /* Knight: make straight movement then diagonal */
     if (abs(toY - fromY) < abs(toX - fromX)) {
        mid.x = start.x + (finish.x - start.x) / 2;
-       mid.y = finish.y;
+       mid.y = start.y;
      } else {
-       mid.x = finish.x;
+       mid.x = start.x;
        mid.y = start.y + (finish.y - start.y) / 2;
      }
   }
@@ -9691,9 +9695,7 @@ AnimateMove(board, fromX, fromY, toX, toY)
   animInfo.pos = finish;
   DrawPosition(FALSE, NULL);
   animInfo.piece = EmptySquare;
-  if(gameInfo.variant == VariantAtomic && 
-     (board[toY][toX] != EmptySquare || fromX != toX && (piece == WhitePawn || piece == BlackPawn) ) )
-	AnimateAtomicCapture(fromX, fromY, toX, toY, 2*nFrames);
+  Explode(board, fromX, fromY, toX, toY);
 }
 
 /*      Convert board position to corner of screen rect and color       */