X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=board.c;h=67e19cabec7b57b5c01f537f82a1bf6edbe11a03;hb=4d26e737943867522d697d69094e49817c05a51b;hp=d89ff7d3770826976073e06e2f86ba5d61a7704a;hpb=dc665d20f1fa64bcbecc86a640151b329b6a6ccb;p=xboard.git

diff --git a/board.c b/board.c
index d89ff7d..67e19ca 100644
--- a/board.c
+++ b/board.c
@@ -194,7 +194,7 @@ SetPremoveHighlights (int fromX, int fromY, int toX, int toY)
     }
     if (pm2X != toX || pm2Y != toY) {
 	if (pm2X >= 0 && pm2Y >= 0) {
-	    damage[0][pm1Y][pm1X] |= 2;
+	    damage[0][pm2Y][pm2X] |= 2;
 	}
     }
     pm1X = fromX;
@@ -641,7 +641,7 @@ again:
   if(Explode(board, fromX, fromY, toX, toY)) { // mark as damaged
     int i,j;
     for(i=0; i<BOARD_WIDTH; i++) for(j=0; j<BOARD_HEIGHT; j++)
-      if((i-toX)*(i-toX) + (j-toY)*(j-toY) < 6) damage[0][j][i] |=  1 + ((i-toX ^ j-toY) & 1);
+      if((i-toX)*(i-toX) + (j-toY)*(j-toY) < 6) damage[0][j][i] |= 2;
   }
 
   /* Be sure end square is redrawn, with piece in it */
@@ -914,7 +914,7 @@ SquareExpose(int i, int j, int d)
 }
 
 void
-DrawPosition (int repaint, Board board)
+DrawPositionX (int repaint, Board board)
 {
     int i, j, do_flash, exposeAll = False;
     static int lastFlipView = 0;
@@ -1043,7 +1043,7 @@ DrawPosition (int repaint, Board board)
 			SquareExpose(i, j, lineGap);
 		    else
 			SquareExpose(i, j, 0);
-		    damage[nr][i][j] = 0;
+		    if(nr == 0) damage[nr][i][j] = 0; // on auxiliary board we retain arrow damage
 		}
     }
 
@@ -1052,10 +1052,19 @@ DrawPosition (int repaint, Board board)
     else {
 	TimeMark now;
 	GetTimeMark(&now);
-	if(SubtractTimeMarks(&now, &programStartTime) < 1000) {
-	    DrawSeekBackground(2*squareSize, 3*squareSize, 6*squareSize, 5*squareSize);
-	    DrawText("Right-clicking dialog texts", 2*squareSize + 5, 3*squareSize + 5, 2);
-	    DrawText("pops up help on them", 2*squareSize + 5, (int) (3.3*squareSize) + 5, 2);
+	if(repaint && SubtractTimeMarks(&now, &programStartTime) < 1000) {
+	    char *p = appData.message, *q;
+	    i = 0;
+	    while(*p) {
+		q = strchr(p, '\n');
+		if(q) *q = NULLCHAR;
+		if(!strstr(appData.suppress, p)) {
+		    if(i == 0) DrawSeekBackground(2*squareSize, 3*squareSize, 6.5*squareSize, 5*squareSize);
+		    DrawText(p, 2*squareSize + 5, (int) ((3 + 0.3*i++)*squareSize) + 5, 2);
+		}
+		if(q) *q++ = '\n'; else q = "";
+		p = q;
+	    }
 	    GraphExpose(currBoard, 2*squareSize, 3*squareSize, 4*squareSize, 2*squareSize);
 	    messedUp = TRUE;
 	} else messedUp = FALSE;