X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=e4b8692a25517b987b4994008c554826a8334e20;hb=HEAD;hp=176dc355604cda3571008364da90bb9c3f947b8e;hpb=76fa6232bcd7341db17947ddf9679c6f3b6504a1;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index 176dc35..e4b8692 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -5,7 +5,8 @@
  * Massachusetts.
  *
  * Enhancements Copyright 1992-2001, 2002, 2003, 2004, 2005, 2006,
- * 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Free Software Foundation, Inc.
+ * 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Free
+ * Software Foundation, Inc.
  *
  * Enhancements Copyright 2005 Alessandro Scotti
  *
@@ -1145,7 +1146,7 @@ InitInstance(HINSTANCE hInstance, int nCmdShow, LPSTR lpCmdLine)
       broadcast.which = "broadcaster";
       broadcast.pr   = NoProc;
       broadcast.isr  = NULL;
-      broadcast.prog = c + 3;
+      broadcast.program = c + 3;
       broadcast.dir  = ".";
       broadcast.host = "localhost";
       StartChessProgram(&broadcast);
@@ -2714,6 +2715,18 @@ InitDrawingSizes(BoardSize boardSize, int flags)
     pieceBitmap[0][WhiteLion] = DoLoadBitmap(hInst, "ln", squareSize, "s");
     pieceBitmap[1][WhiteLion] = DoLoadBitmap(hInst, "ln", squareSize, "o");
     pieceBitmap[2][WhiteLion] = DoLoadBitmap(hInst, "ln", squareSize, "w");
+    pieceBitmap[0][WhiteCub] = DoLoadBitmap(hInst, "ln", squareSize, "s");
+    pieceBitmap[1][WhiteCub] = DoLoadBitmap(hInst, "ln", squareSize, "o");
+    pieceBitmap[2][WhiteCub] = DoLoadBitmap(hInst, "ln", squareSize, "w");
+    pieceBitmap[0][WhiteWolf] = DoLoadBitmap(hInst, "wolf", squareSize, "s");
+    pieceBitmap[1][WhiteWolf] = DoLoadBitmap(hInst, "wolf", squareSize, "o");
+    pieceBitmap[2][WhiteWolf] = DoLoadBitmap(hInst, "wolf", squareSize, "w");
+    pieceBitmap[0][WhiteCamel] = DoLoadBitmap(hInst, "camel", squareSize, "s");
+    pieceBitmap[1][WhiteCamel] = DoLoadBitmap(hInst, "camel", squareSize, "o");
+    pieceBitmap[2][WhiteCamel] = DoLoadBitmap(hInst, "camel", squareSize, "w");
+    pieceBitmap[0][WhiteZebra] = DoLoadBitmap(hInst, "zebra", squareSize, "s");
+    pieceBitmap[1][WhiteZebra] = DoLoadBitmap(hInst, "zebra", squareSize, "o");
+    pieceBitmap[2][WhiteZebra] = DoLoadBitmap(hInst, "n", squareSize, "w");
 
     if(gameInfo.variant == VariantShogi && BOARD_HEIGHT != 7) { /* promoted Gold representations (but not in Tori!)*/
       pieceBitmap[0][WhiteCannon] = DoLoadBitmap(hInst, "wp", squareSize, "s");
@@ -3740,6 +3753,8 @@ void DrawSeekClose()
 {
 }
 
+
+
 VOID
 HDCDrawPosition(HDC hdc, BOOLEAN repaint, Board board)
 {
@@ -3960,6 +3975,7 @@ HDCDrawPosition(HDC hdc, BOOLEAN repaint, Board board)
 	 explodes.  The old and new positions both had an empty square
 	 at the destination, but animation has drawn a piece there and
 	 we have to remember to erase it. [HGM] moved until after setting lastDrawn */
+
       lastDrawn[0][animInfo.to.y][animInfo.to.x] = animInfo.piece;
     }
   }
@@ -4093,7 +4109,12 @@ HDCDrawPosition(HDC hdc, BOOLEAN repaint, Board board)
   if(saveDiagFlag) { 
     BITMAP b; int i, j=0, m, w, wb, fac=0; char *pData; 
     BITMAPINFOHEADER bih; int color[16], nrColors=0;
+    HBITMAP src = bufferBitmap, obmp; HDC tmp = CreateCompatibleDC(hdc);
 
+    bufferBitmap = CreateCompatibleBitmap(hdc, boardRect.right-boardRect.left, Rect.bottom-Rect.top-2*OUTER_MARGIN);
+    obmp = SelectObject(tmp, bufferBitmap);
+    BitBlt(tmp, 0, 0, boardRect.right - boardRect.left, Rect.bottom - Rect.top - 2*OUTER_MARGIN,
+           tmphdc, boardRect.left, OUTER_MARGIN, SRCCOPY);
     GetObject(bufferBitmap, sizeof(b), &b);
     if(pData = malloc(b.bmWidthBytes*b.bmHeight + 10000)) {
 	bih.biSize = sizeof(BITMAPINFOHEADER);
@@ -4161,6 +4182,9 @@ HDCDrawPosition(HDC hdc, BOOLEAN repaint, Board board)
 		fputc(pData[i], diagFile);
 	free(pData);
      }
+     DeleteObject(bufferBitmap); bufferBitmap = src;
+     SelectObject(tmp, obmp);
+     DeleteDC(tmp);
   }
 
   SelectObject(tmphdc, oldBitmap);
@@ -8246,8 +8270,8 @@ ModeHighlight()
     nowChecked = 0;
     break;
   }
-  if(prevChecked == IDM_TwoMachine) // [HGM] 'Machine Match' might have gotten disabled when stopping match
-    EnableMenuItem(GetMenu(hwndMain), IDM_Match, MF_BYCOMMAND|MF_ENABLED)
+  if(prevChecked == IDM_TwoMachines) // [HGM] 'Machine Match' might have gotten disabled when stopping match
+    EnableMenuItem(GetMenu(hwndMain), IDM_Match, MF_BYCOMMAND|MF_ENABLED);
   CheckMark(prevChecked, MF_UNCHECKED);
   CheckMark(nowChecked, MF_CHECKED);
   CheckMark(IDM_Match, matchMode && matchGame < appData.matchGames ? MF_CHECKED : MF_UNCHECKED);
@@ -8492,6 +8516,7 @@ DisplayFatalError(char *str, int error, int exitStatus)
     fprintf(debugFP, "%s: %s\n", label, str);
   }
   if (appData.popupExitMessage) {
+    if(appData.icsActive) SendToICS("logout\n"); // [HGM] make sure no new games will be started!
     (void) MessageBox(hwndMain, str, label, MB_OK|
 		      (exitStatus ? MB_ICONSTOP : MB_ICONINFORMATION));
   }
@@ -9114,6 +9139,7 @@ IDLE_PRIORITY_CLASS         0x00000040
 */
         if (nice < -15) return 0x00000080;
         if (nice < 0)   return 0x00008000;
+
         if (nice == 0)  return 0x00000020;
         if (nice < 15)  return 0x00004000;
         return 0x00000040;
@@ -10024,8 +10050,8 @@ AnimateMove(board, fromX, fromY, toX, toY)
      int toX;
      int toY;
 {
-  ChessSquare piece;
-  int x = toX, y = toY;
+  ChessSquare piece, victim = EmptySquare, victim2 = EmptySquare;
+  int x = toX, y = toY, x2 = kill2X;
   POINT start, finish, mid;
   POINT frames[kFactor * 2 + 1];
   int nFrames, n;
@@ -10038,7 +10064,11 @@ AnimateMove(board, fromX, fromY, toX, toY)
   piece = board[fromY][fromX];
   if (piece >= EmptySquare) return;
 
-  if(killX >= 0) toX = killX, toY = killY; // [HGM] lion: first to kill square
+  if(x2 >= 0) toX = kill2X, toY = kill2Y,  victim = board[killY][killX], victim2 = board[kill2Y][kill2X]; else
+  if(killX >= 0) toX = killX, toY = killY, victim = board[killY][killX]; // [HGM] lion: first to kill square
+
+  animInfo.from.x = fromX;
+  animInfo.from.y = fromY;
 
 again:
 
@@ -10066,22 +10096,30 @@ again:
   else
     Tween(&start, &mid, &finish, kFactor, frames, &nFrames);
 
-  animInfo.from.x = fromX;
-  animInfo.from.y = fromY;
   animInfo.to.x = toX;
   animInfo.to.y = toY;
   animInfo.lastpos = start;
   animInfo.piece = piece;
   for (n = 0; n < nFrames; n++) {
     animInfo.pos = frames[n];
-    DrawPosition(FALSE, NULL);
+    DrawPosition(FALSE, board);
     animInfo.lastpos = animInfo.pos;
     Sleep(appData.animSpeed);
   }
   animInfo.pos = finish;
-  DrawPosition(FALSE, NULL);
-
-  if(toX != x || toY != y) { fromX = toX; fromY = toY; toX = x; toY = y; goto again; } // second leg
+  DrawPosition(FALSE, board);
+
+  if(toX == x2 && toY == kill2Y) {
+    fromX = toX; fromY = toY; toX = killX; toY = killY; x2 = -1;
+    board[kill2Y][kill2X] = EmptySquare; goto again;
+  } // second leg
+  if(toX != x || toY != y) {
+    fromX = toX; fromY = toY; toX = x; toY = y;
+    board[killY][killX] = EmptySquare; goto again;
+  } // second leg
+
+if(victim2 != EmptySquare) board[kill2Y][kill2X] = victim2;
+if(victim  != EmptySquare) board[killY][killX] = victim;
 
   animInfo.piece = EmptySquare;
   Explode(board, fromX, fromY, toX, toY);