X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xboard.c;h=afc3e6d1707fca798ef4c2fafaf9257ff3720907;hb=739a44fd95050c7986678c41f655bc89cfce7f0d;hp=7ddd4a8fcf8d4cdcff616ae686376bdee02450db;hpb=d80f24c825e4f0102d77cdf092197304949d46ca;p=xboard.git

diff --git a/xboard.c b/xboard.c
index 7ddd4a8..afc3e6d 100644
--- a/xboard.c
+++ b/xboard.c
@@ -3161,7 +3161,8 @@ XBoard square size (hint): %d\n\
 	    signal(SIGUSR1, CmailSigHandler);
 	}
     }
-	InitPosition(TRUE);
+    gameInfo.boardWidth = 0; // [HGM] pieces: kludge to ensure InitPosition() calls InitDrawingSizes()
+    InitPosition(TRUE);
 
     XtAppMainLoop(appContext);
     if (appData.debugMode) fclose(debugFP); // [DM] debug
@@ -8225,12 +8226,12 @@ DisplayTimerLabel(w, color, timer, highlight)
     char buf[MSG_SIZ];
     Arg args[16];
 
+    /* check for low time warning */
     Pixel foregroundOrWarningColor = timerForegroundPixel;
 
-    if (timer > 0
-	&& appData.lowTimeWarning
-	&& (timer / 1000) < appData.icsAlarmTime)
-
+    if (timer > 0 &&
+        appData.lowTimeWarning && 
+        (timer / 1000) < appData.icsAlarmTime)
       foregroundOrWarningColor = lowTimeWarningColor;
 
     if (appData.clockMode) {
@@ -9257,6 +9258,10 @@ AnimateMove(board, fromX, fromY, toX, toY)
   if (!appData.animate || appData.blindfold)
     return;
 
+  if(board[toY][toX] == WhiteRook && board[fromY][fromX] == WhiteKing || 
+     board[toY][toX] == BlackRook && board[fromY][fromX] == BlackKing) 
+	return; // [HGM] FRC: no animtion of FRC castlings, as to-square is not true to-square
+
   if (fromY < 0 || fromX < 0 || toX < 0 || toY < 0) return;
   piece = board[fromY][fromX];
   if (piece >= EmptySquare) return;