X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=f20e67145a841343e8aa216fc5c76f9dd8bb4948;hb=7f4e264c413aa1853b9f9587e577cab2bc60b2a3;hp=f26312458b5ce3a16d70a6c62380061db2b72a09;hpb=479f77d2fd8344604745c53db93d8147a571d7bd;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index f263124..f20e671 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -100,8 +100,10 @@
 extern int whiteFlag, blackFlag;
 Boolean flipClock = FALSE;
 extern HANDLE chatHandle[];
-extern int ics_type;
+extern enum ICS_TYPE ics_type;
 
+int  MySearchPath P((char *installDir, char *name, char *fullname));
+int  MyGetFullPathName P((char *name, char *fullname));
 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,
@@ -2234,12 +2236,28 @@ InitDrawingSizes(BoardSize boardSize, int flags)
   RECT crect, wrect, oldRect;
   int offby;
   LOGBRUSH logbrush;
+  VariantClass v = gameInfo.variant;
 
   int suppressVisibleEffects = 0; // [HGM] kludge to request updating sizeInfo only
   if((int)boardSize >= 1000 ) { boardSize -= 1000; suppressVisibleEffects = 1; }
 
   /* [HGM] call with -2 uses old size (for if nr of files, ranks changes) */
   if(boardSize == (BoardSize)(-2) ) boardSize = oldBoardSize;
+  oldBoardSize = boardSize;
+
+  if(boardSize != SizeMiddling && boardSize != SizePetite && boardSize != SizeBulky && !appData.useFont)
+  { // correct board size to one where built-in pieces exist
+    if((v == VariantCapablanca || v == VariantGothic || v == VariantGrand || v == VariantCapaRandom || v == VariantJanus || v == VariantSuper)
+       && (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 ) {
+      if(boardSize < SizeMediocre) boardSize = SizePetite; else
+      if(boardSize > SizeModerate) boardSize = SizeBulky;  else
+                                   boardSize = SizeMiddling;
+    }
+  }
+  if(!appData.useFont && boardSize == SizePetite && (v == VariantShogi || v == VariantKnightmate)) boardSize = SizeMiddling; // no Unicorn in Petite
 
   oldRect.left = wpMain.x; //[HGM] placement: remember previous window params
   oldRect.top = wpMain.y;
@@ -2348,7 +2366,6 @@ InitDrawingSizes(BoardSize boardSize, int flags)
 
   sizeInfo[boardSize].cliWidth = boardRect.right + OUTER_MARGIN;
   sizeInfo[boardSize].cliHeight = boardRect.bottom + OUTER_MARGIN;
-  oldBoardSize = boardSize;
   oldTinyLayout = tinyLayout;
   winW = 2 * GetSystemMetrics(SM_CXFRAME) + boardRect.right + OUTER_MARGIN;
   winH = 2 * GetSystemMetrics(SM_CYFRAME) + GetSystemMetrics(SM_CYMENU) +