X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=917a532a1ea842a5a34c2abb585b5c0c9c2c6a8d;hb=35f89898c92a8709618e2db77b11cbedfd7fc48c;hp=e5df6db5ece130782ae3e1a773cc42ac17c143e2;hpb=47b01ac7b7d35856fae5bef60de3255e8f0d4ae5;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index e5df6db..917a532 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -92,6 +92,9 @@
 #include "help.h"
 #include "wsnap.h"
 
+#define SLASH '/'
+#define DATADIR "~~"
+
 //void InitEngineUCI( const char * iniDir, ChessProgramState * cps );
 
   int myrandom(void);
@@ -109,7 +112,6 @@ VOID NewVariantPopup(HWND hwnd);
 int FinishMove P((ChessMove moveType, int fromX, int fromY, int toX, int toY,
 		   /*char*/int promoChar));
 void DisplayMove P((int moveNumber));
-Boolean ParseFEN P((Board board, int *blackPlaysFirst, char *fen));
 void ChatPopUp P((char *s));
 typedef struct {
   ChessSquare piece;  
@@ -2273,7 +2275,7 @@ InitDrawingSizes(BoardSize boardSize, int flags)
        && (boardSize < SizePetite || boardSize > SizeBulky) // Archbishop and Chancellor available in entire middle range
       || (v == VariantShogi && boardSize != SizeModerate)   // Japanese-style Shogi
       ||  v == VariantKnightmate || v == VariantSChess || v == VariantXiangqi || v == VariantSpartan
-      ||  v == VariantShatranj || v == VariantMakruk || v == VariantGreat || v == VariantFairy ) {
+      ||  v == VariantShatranj || v == VariantMakruk || v == VariantGreat || v == VariantFairy || v == VariantLion ) {
       if(boardSize < SizeMediocre) boardSize = SizePetite; else
       if(boardSize > SizeModerate) boardSize = SizeBulky;  else
                                    boardSize = SizeMiddling;
@@ -2629,6 +2631,9 @@ InitDrawingSizes(BoardSize boardSize, int flags)
     pieceBitmap[0][WhiteUnicorn] = DoLoadBitmap(hInst, "u", squareSize, "s");
     pieceBitmap[1][WhiteUnicorn] = DoLoadBitmap(hInst, "u", squareSize, "o");
     pieceBitmap[2][WhiteUnicorn] = DoLoadBitmap(hInst, "u", squareSize, "w");
+    pieceBitmap[0][WhiteLion] = DoLoadBitmap(hInst, "ln", squareSize, "s");
+    pieceBitmap[1][WhiteLion] = DoLoadBitmap(hInst, "ln", squareSize, "o");
+    pieceBitmap[2][WhiteLion] = DoLoadBitmap(hInst, "ln", squareSize, "w");
 
     if(gameInfo.variant == VariantShogi) { /* promoted Gold represemtations */
       pieceBitmap[0][WhiteCannon] = DoLoadBitmap(hInst, "wp", squareSize, "s");
@@ -3251,6 +3256,8 @@ BOOL HasHighlightInfo()
 
     return result;
 
+
+
 }
 
 BOOL IsDrawArrowEnabled()
@@ -4274,8 +4281,10 @@ MouseEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       } else if (PtInRect((LPRECT) &blackRect, pt)) {
 	ClockClick(!flipClock); break;
       }
+    if(dragging) { // [HGM] lion: don't destroy dragging info if we are already dragging
       dragInfo.start.x = dragInfo.start.y = -1;
       dragInfo.from = dragInfo.start;
+    }
     if(fromX == -1 && frozen) { // not sure where this is for
 		fromX = fromY = -1; 
       DrawPosition(forceFullRepaint || FALSE, NULL); /* [AS] */
@@ -4295,7 +4304,7 @@ MouseEvent(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
     if(PromoScroll(pt.x - boardRect.left, pt.y - boardRect.top)) break;
     MovePV(pt.x - boardRect.left, pt.y - boardRect.top, boardRect.bottom - boardRect.top);
     if ((appData.animateDragging || appData.highlightDragging)
-	&& (wParam & MK_LBUTTON)
+	&& (wParam & MK_LBUTTON || dragging == 2)
 	&& dragInfo.from.x >= 0) 
     {
       BOOL full_repaint = FALSE;
@@ -4439,6 +4448,8 @@ ButtonProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
   return CallWindowProc(buttonDesc[i].wndproc, hwnd, message, wParam, lParam);
 }
 
+static int promoStyle;
+
 /* Process messages for Promotion dialog box */
 LRESULT CALLBACK
 Promotion(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
@@ -4469,13 +4480,9 @@ Promotion(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
          PieceToChar(BlackMarshall) != '~')   ) ?
 	       SW_SHOW : SW_HIDE);
     /* [HGM] Hide B & R button in Shogi, use Q as promote, N as defer */
-    ShowWindow(GetDlgItem(hDlg, PB_Rook),
-       gameInfo.variant != VariantShogi ?
-	       SW_SHOW : SW_HIDE);
-    ShowWindow(GetDlgItem(hDlg, PB_Bishop), 
-       gameInfo.variant != VariantShogi ?
-	       SW_SHOW : SW_HIDE);
-    if(gameInfo.variant == VariantShogi) {
+    ShowWindow(GetDlgItem(hDlg, PB_Rook),   !promoStyle ? SW_SHOW : SW_HIDE);
+    ShowWindow(GetDlgItem(hDlg, PB_Bishop), !promoStyle ? SW_SHOW : SW_HIDE);
+    if(promoStyle) {
         SetDlgItemText(hDlg, PB_Queen, "YES");
         SetDlgItemText(hDlg, PB_Knight, "NO");
         SetWindowText(hDlg, "Promote?");
@@ -4496,7 +4503,7 @@ Promotion(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       promoChar = gameInfo.variant == VariantSuper ? PieceToChar(BlackSilver) : PieceToChar(BlackKing);
       break;
     case PB_Queen:
-      promoChar = gameInfo.variant == VariantShogi ? '+' : ToLower(PieceToChar(WhiteOnMove(currentMove) ? WhiteQueen : BlackQueen));
+      promoChar = promoStyle ? '+' : ToLower(PieceToChar(WhiteOnMove(currentMove) ? WhiteQueen : BlackQueen));
       break;
     case PB_Rook:
       promoChar = ToLower(PieceToChar(WhiteOnMove(currentMove) ? WhiteRook : BlackRook));
@@ -4513,7 +4520,8 @@ Promotion(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       promoChar = ToLower(PieceToChar(WhiteOnMove(currentMove) ? WhiteAngel : BlackAngel));
       break;
     case PB_Knight:
-      promoChar = gameInfo.variant == VariantShogi ? '=' : PieceToChar(WhiteOnMove(currentMove) ? WhiteKnight : BlackKnight);
+      promoChar = gameInfo.variant == VariantShogi ? '=' : promoStyle ? NULLCHAR : 
+                  ToLower(PieceToChar(WhiteOnMove(currentMove) ? WhiteKnight : BlackKnight));
       break;
     default:
       return FALSE;
@@ -4544,8 +4552,9 @@ PromotionPopup(HWND hwnd)
 }
 
 void
-PromotionPopUp()
+PromotionPopUp(char choice)
 {
+  promoStyle = (choice == '+');
   DrawPosition(TRUE, NULL);
   PromotionPopup(hwndMain);
 }
@@ -5105,6 +5114,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       break;
 
     case IDM_Rematch:
+
       RematchEvent();
       break;
 
@@ -6262,6 +6272,7 @@ StartupDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 	SwapEngines(singleList); // temporarily swap first and second, to load a second 'first', ...
 	ParseArgs(StringGet, &p);
 	SwapEngines(singleList); // ... and then make it 'second'
+
 	appData.noChessProgram = FALSE;
 	appData.icsActive = FALSE;
       } else if (IsDlgButtonChecked(hDlg, OPT_ChessServer)) {
@@ -6839,6 +6850,7 @@ GothicPopUp(char *title, VariantClass variant)
 static char *history[HISTORY_SIZE];
 int histIn = 0, histP = 0;
 
+
 VOID
 SaveInHistory(char *cmd)
 {
@@ -6851,6 +6863,7 @@ SaveInHistory(char *cmd)
   histIn = (histIn + 1) % HISTORY_SIZE;
   if (history[histIn] != NULL) {
     free(history[histIn]);
+
     history[histIn] = NULL;
   }
   histP = histIn;
@@ -7661,6 +7674,7 @@ DoWriteFile(HANDLE hFile, char *buf, int count, DWORD *outCount,
       else
 	err = GetLastError();
     }
+
   }
   return err;
 }
@@ -8526,6 +8540,7 @@ HWND gameListOptionsDialog;
 
 // low-level front-end: clear text edit / list widget
 void
+
 GLT_ClearList()
 {
     SendDlgItemMessage( gameListOptionsDialog, IDC_GameListTags, LB_RESETCONTENT, 0, 0 );
@@ -8717,6 +8732,13 @@ EditCommentPopUp(int index, char *title, char *str)
 }
 
 
+int
+Roar()
+{
+  MyPlaySound(&sounds[(int)SoundRoar]);
+  return 1;
+}
+
 VOID
 RingBell()
 {
@@ -8874,6 +8896,7 @@ DisplayBlackClock(long timeRemaining, int highlight)
   HDC hdc;
   char *flag = blackFlag && gameMode == TwoMachinesPlay ? "(!)" : "";
 
+
   if(appData.noGUI) return;
   hdc = GetDC(hwndMain);
   if (!IsIconic(hwndMain)) {
@@ -9892,16 +9915,23 @@ AnimateMove(board, fromX, fromY, toX, toY)
      int toY;
 {
   ChessSquare piece;
+  int x = toX, y = toY;
   POINT start, finish, mid;
   POINT frames[kFactor * 2 + 1];
   int nFrames, n;
 
+  if(killX >= 0 && IS_LION(board[fromY][fromX])) Roar();
+
   if (!appData.animate) return;
   if (doingSizing) return;
   if (fromY < 0 || fromX < 0) return;
   piece = board[fromY][fromX];
   if (piece >= EmptySquare) return;
 
+  if(killX >= 0) toX = killX, toY = killY; // [HGM] lion: first to kill square
+
+again:
+
   ScreenSquare(fromX, fromY, &start);
   ScreenSquare(toX, toY, &finish);
 
@@ -9940,6 +9970,9 @@ AnimateMove(board, fromX, fromY, toX, toY)
   }
   animInfo.pos = finish;
   DrawPosition(FALSE, NULL);
+
+  if(toX != x || toY != y) { fromX = toX; fromY = toY; toX = x; toY = y; goto again; } // second leg
+
   animInfo.piece = EmptySquare;
   Explode(board, fromX, fromY, toX, toY);
 }