X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=backend.c;h=bd641fea724a47c2012766ff35c28f13c6a11367;hb=357e76cac0dedc4522e0018b0fb49abbe879c4da;hp=05f7dfcce76dda9dbfd48b0dd1ecbdfbbc497cbe;hpb=49f132baf7cc5d30a2efca71acb37f7221bd6311;p=xboard.git

diff --git a/backend.c b/backend.c
index 05f7dfc..bd641fe 100644
--- a/backend.c
+++ b/backend.c
@@ -3855,7 +3855,7 @@ ParseBoard12(string)
     int j, k, n, moveNum, white_stren, black_stren, white_time, black_time, takeback;
     int double_push, castle_ws, castle_wl, castle_bs, castle_bl, irrev_count;
     char to_play, board_chars[200];
-    char move_str[500], str[500], elapsed_time[500];
+    char move_str[MSG_SIZ], str[MSG_SIZ], elapsed_time[MSG_SIZ];
     char black[32], white[32];
     Board board;
     int prevMove = currentMove;
@@ -3896,7 +3896,7 @@ ParseBoard12(string)
 	       &ticking);
 
     if (n < 21) {
-        snprintf(str, sizeof(str), _("Failed to parse board string:\n\"%s\""), string);
+        snprintf(str, MSG_SIZ, _("Failed to parse board string:\n\"%s\""), string);
 	DisplayError(str, 0);
 	return;
     }
@@ -4345,7 +4345,7 @@ ParseBoard12(string)
 	  if(!appData.testLegality && move_str[1] != '@') { // drops never ambiguous (parser chokes on long form!)
 		if(appData.debugMode)
 			fprintf(debugFP, "replaced ICS move '%s' by '%s'\n", move_str, buf);
-		safeStrCpy(move_str, buf, sizeof(move_str)/sizeof(move_str[0]));
+		safeStrCpy(move_str, buf, MSG_SIZ);
           }
 	  valid = ParseOneMove(move_str, moveNum - 1, &moveType,
 				&fromX, &fromY, &toX, &toY, &promoChar)
@@ -6340,6 +6340,8 @@ Explode(Board board, int fromX, int fromY, int toX, int toY)
     return FALSE;
 }
 
+ChessSquare gatingPiece = EmptySquare; // exported to front-end, for dragging
+
 void LeftClick(ClickType clickType, int xPix, int yPix)
 {
     int x, y;
@@ -6396,8 +6398,15 @@ void LeftClick(ClickType clickType, int xPix, int yPix)
     autoQueen = appData.alwaysPromoteToQueen;
 
     if (fromX == -1) {
+      gatingPiece = EmptySquare;
+      if (clickType != Press) {
+	if(dragging) { // [HGM] from-square must have been reset due to game end since last press
+	    DragPieceEnd(xPix, yPix); dragging = 0;
+	    DrawPosition(FALSE, NULL);
+	}
+	return;
+      }
       if(!appData.oneClick || !OnlyMove(&x, &y, FALSE)) {
-	if (clickType == Press) {
 	    /* First square */
 	    if (OKToStartUserMove(x, y)) {
 		fromX = x;
@@ -6409,12 +6418,8 @@ void LeftClick(ClickType clickType, int xPix, int yPix)
 		    SetHighlights(x, y, -1, -1);
 		}
 	    }
-	} else if(dragging) { // [HGM] from-square must have been reset due to game end since last press
-	    DragPieceEnd(xPix, yPix); dragging = 0;
-	    DrawPosition(FALSE, NULL);
+	    return;
 	}
-	return;
-      }
     }
 
     /* fromX != -1 */
@@ -6429,7 +6434,7 @@ void LeftClick(ClickType clickType, int xPix, int yPix)
 	/* Check if clicking again on the same color piece */
 	fromP = boards[currentMove][fromY][fromX];
 	toP = boards[currentMove][y][x];
-	frc = gameInfo.variant == VariantFischeRandom || gameInfo.variant == VariantCapaRandom;
+	frc = gameInfo.variant == VariantFischeRandom || gameInfo.variant == VariantCapaRandom || gameInfo.variant == VariantSChess;
  	if ((WhitePawn <= fromP && fromP <= WhiteKing &&
 	     WhitePawn <= toP && toP <= WhiteKing &&
 	     !(fromP == WhiteKing && toP == WhiteRook && frc) &&
@@ -6447,6 +6452,11 @@ void LeftClick(ClickType clickType, int xPix, int yPix)
 		ClearHighlights();
 	    }
 	    if (OKToStartUserMove(x, y)) {
+		if(gameInfo.variant == VariantSChess && // S-Chess: back-rank piece selected after holdings means gating
+		  (fromX == BOARD_LEFT-2 || fromX == BOARD_RGHT+1) &&
+               y == (toP < BlackPawn ? 0 : BOARD_HEIGHT-1))
+                 gatingPiece = boards[currentMove][fromY][fromX];
+		else gatingPiece = EmptySquare;
 		fromX = x;
 		fromY = y; dragging = 1;
 		MarkTargetSquares(0);
@@ -6470,6 +6480,7 @@ void LeftClick(ClickType clickType, int xPix, int yPix)
 	    /* Second up/down in same square; just abort move */
 	    second = 0;
 	    fromX = fromY = -1;
+	    gatingPiece = EmptySquare;
 	    ClearHighlights();
 	    gotPremove = 0;
 	    ClearPremoveHighlights();
@@ -6534,6 +6545,8 @@ void LeftClick(ClickType clickType, int xPix, int yPix)
     // off-board moves should not be highlighted
     if(x < 0 || y < 0) ClearHighlights();
 
+    if(gatingPiece != EmptySquare) promoChoice = ToLower(PieceToChar(gatingPiece));
+
     if (HasPromotionChoice(fromX, fromY, toX, toY, &promoChoice)) {
 	SetHighlights(fromX, fromY, toX, toY);
 	if(gameInfo.variant == VariantSuper || gameInfo.variant == VariantGreat) {