X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=293b643e9a5b3653501b39f1870bda687555d3e1;hb=0c326a397b77561e9cd232549eb98c756f5a8baf;hp=c6a443ed2fd2e25bf9719500d62748be4d5167fc;hpb=cd09c1f0a427cdce02abb65d05dc7279a1557c99;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index c6a443e..293b643 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -55,6 +55,10 @@
  *------------------------------------------------------------------------
  ** See the file ChangeLog for a revision history.  */
 
+#ifndef WINVER
+#define WINVER 0x0500
+#endif
+
 #include "config.h"
 
 #include <windows.h>
@@ -2193,7 +2197,7 @@ void CreatePiecesFromFont()
 HBITMAP
 DoLoadBitmap(HINSTANCE hinst, char *piece, int squareSize, char *suffix)
 {
-  char name[128], buf[MSG_SIZ];
+  char name[128], buf[MSG_SIZ], *ids = "pnbrqfeicwmohajgdvlsukaacvdklnwpwnwlwswolfgnuzebracameltowersword", *p;
 
     snprintf(name, sizeof(name)/sizeof(name[0]), "%s%d%s", piece, squareSize, suffix);
   if(appData.pieceDirectory[0]) {
@@ -2201,6 +2205,30 @@ DoLoadBitmap(HINSTANCE hinst, char *piece, int squareSize, char *suffix)
     snprintf(buf, MSG_SIZ, "%s\\%s.bmp", appData.pieceDirectory, name);
     res = LoadImage( 0, buf, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE );
     if(res) return res;
+    p = strstr(ids, piece);
+    if(p) { // if we could reconstruct canonical piece number, try the pieceNNN_ format before falling back on built-ins
+      int n = p - ids;
+      switch(n) {
+	case 21: n = WhiteKing; break;
+	case 22: n = WhiteAngel; break;
+	case 24: n = WhiteSilver; break;
+	case 26: n = WhiteDragon; break;
+	case 28: n = WhiteLion; break;
+	case 30: n = WhiteTokin; break;
+	case 32: n = WhitePKnight; break;
+	case 34: n = WhitePLance; break;
+	case 36: n = WhitePSilver; break;
+	case 38: n = WhiteWolf; break;
+	case 42: n = WhiteGnu; break;
+	case 45: n = WhiteZebra; break;
+	case 50: n = WhiteCamel; break;
+	case 55: n = WhiteTower; break;
+	case 60: n = WhiteSword; break;
+      }
+      snprintf(buf, MSG_SIZ, "%s\\piece%d_%d%s.bmp", appData.pieceDirectory, n, squareSize, suffix);
+      res = LoadImage( 0, buf, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE );
+      if(res) return res;
+    }
   }
   if (gameInfo.event &&
       strcmp(gameInfo.event, "Easter Egg Hunt") == 0 &&
@@ -2727,6 +2755,15 @@ InitDrawingSizes(BoardSize boardSize, int flags)
     pieceBitmap[0][WhiteZebra] = DoLoadBitmap(hInst, "zebra", squareSize, "s");
     pieceBitmap[1][WhiteZebra] = DoLoadBitmap(hInst, "zebra", squareSize, "o");
     pieceBitmap[2][WhiteZebra] = DoLoadBitmap(hInst, "n", squareSize, "w");
+    pieceBitmap[0][WhiteTower] = DoLoadBitmap(hInst, "tower", squareSize, "s");
+    pieceBitmap[1][WhiteTower] = DoLoadBitmap(hInst, "tower", squareSize, "o");
+    pieceBitmap[2][WhiteTower] = DoLoadBitmap(hInst, "tower", squareSize, "w");
+    pieceBitmap[0][WhiteSword] = DoLoadBitmap(hInst, "sword", squareSize, "s");
+    pieceBitmap[1][WhiteSword] = DoLoadBitmap(hInst, "sword", squareSize, "o");
+    pieceBitmap[2][WhiteSword] = DoLoadBitmap(hInst, "sword", squareSize, "w");
+    pieceBitmap[0][WhiteGnu] = DoLoadBitmap(hInst, "gnu", squareSize, "s");
+    pieceBitmap[1][WhiteGnu] = DoLoadBitmap(hInst, "gnu", squareSize, "o");
+    pieceBitmap[2][WhiteGnu] = DoLoadBitmap(hInst, "gnu", squareSize, "w");
 
     if(gameInfo.variant == VariantShogi && BOARD_HEIGHT != 7) { /* promoted Gold representations (but not in Tori!)*/
       pieceBitmap[0][WhiteCannon] = DoLoadBitmap(hInst, "wp", squareSize, "s");
@@ -2983,7 +3020,7 @@ VOID
 DrawPieceOnDC(HDC hdc, ChessSquare piece, int color, int sqcolor, int x, int y, HDC tmphdc)
 {
   HBITMAP oldBitmap;
-  HBRUSH oldBrush;
+  HBRUSH oldBrush = NULL;
   int tmpSize;
 
   if (appData.blindfold) return;
@@ -3042,6 +3079,20 @@ DrawPieceOnDC(HDC hdc, ChessSquare piece, int color, int sqcolor, int x, int y,
       y += squareSize - minorSize - 2;
       tmpSize = minorSize;
     }
+#if WINVER >= 0x0500
+    HBITMAP pbm = PieceBitmap(piece, color ? OUTLINE_PIECE : SOLID_PIECE);
+    BITMAP b;
+    GetObject(pbm, sizeof(BITMAP), &b);
+    if(b.bmBitsPixel == 32) { // for now this is a kludge to indicate bitmaps with alpha channel
+	BLENDFUNCTION bf;
+	bf.BlendOp = AC_SRC_OVER;
+	bf.BlendFlags = 0;
+	bf.SourceConstantAlpha = 0xFF;
+	bf.AlphaFormat = AC_SRC_ALPHA;
+	oldBitmap = SelectObject(tmphdc, pbm);
+	AlphaBlend(hdc, x, y, tmpSize, tmpSize, tmphdc, 0, 0, tmpSize, tmpSize, bf);
+    } else
+#endif
     if (color || appData.allWhite ) {
       oldBitmap = SelectObject(tmphdc, PieceBitmap(piece, WHITE_PIECE));
       if( color )
@@ -3078,7 +3129,7 @@ DrawPieceOnDC(HDC hdc, ChessSquare piece, int color, int sqcolor, int x, int y,
       else
         BitBlt(hdc, x, y, tmpSize, tmpSize, tmphdc, 0, 0, 0x00B8074A);
     }
-    SelectObject(hdc, oldBrush);
+    if(oldBrush) SelectObject(hdc, oldBrush);
     SelectObject(tmphdc, oldBitmap);
   }
 }
@@ -3754,6 +3805,9 @@ void DrawSeekClose()
 }
 
 
+
+
+
 VOID
 HDCDrawPosition(HDC hdc, BOOLEAN repaint, Board board)
 {
@@ -3974,6 +4028,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;
     }
   }
@@ -4176,6 +4231,7 @@ HDCDrawPosition(HDC hdc, BOOLEAN repaint, Board board)
 	if(fac)
 	for(i=0; i<16; i++) fputDW(diagFile, color[i]);
 	// write bitmap data
+
 	for(i=0; i<wb*(b.bmHeight - boardRect.top + OUTER_MARGIN); i++) 
 		fputc(pData[i], diagFile);
 	free(pData);
@@ -6270,6 +6326,8 @@ InitComboStringsFromOption(HANDLE hwndCombo, char *str)
     str = buf1;
   }
 
+
+
   SendMessage(hwndCombo, CB_RESETCONTENT, 0, 0);
 
   for (;;) {
@@ -8528,6 +8586,11 @@ DisplayInformation(char *str)
   (void) MessageBox(hwndMain, str, _("Information"), MB_OK|MB_ICONINFORMATION);
 }
 
+char *
+Shorten (char *s)
+{
+  return s;
+}
 
 VOID
 DisplayNote(char *str)
@@ -9137,6 +9200,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;
@@ -10047,8 +10111,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;
@@ -10061,7 +10125,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:
 
@@ -10089,22 +10157,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);