From: H.G. Muller <h.g.muller@hccnet.nl>
Date: Fri, 19 Nov 2010 20:09:24 +0000 (+0100)
Subject: Give Lance moves of Amazon in variant super
X-Git-Url: http://winboard.nl/cgi-bin?a=commitdiff_plain;h=020fc338d749be0f8f49d133911a6c33d2eb56a1;p=xboard.git

Give Lance moves of Amazon in variant super

Now that Lance is no longer a wild-card piece the moves of Amazon must
be programmed explicitly, to keep the possibbilty to play Superchess
with legality testing on.
---

diff --git a/moves.c b/moves.c
index 4df7d42..6fa6693 100644
--- a/moves.c
+++ b/moves.c
@@ -635,8 +635,25 @@ void GenPseudoLegal(board, flags, callback, closure)
 		  }
 	      break;
 
+	    Amazon:
+	      /* First do Bishop,then continue like Chancellor */
+	      for (rs = -1; rs <= 1; rs += 2)
+                for (fs = -1; fs <= 1; fs += 2)
+		  for (i = 1;; i++) {
+		      rt = rf + (i * rs);
+		      ft = ff + (i * fs);
+                      if (rt < 0 || rt >= BOARD_HEIGHT || ft < BOARD_LEFT || ft >= BOARD_RGHT) break;
+		      if (SameColor(board[rf][ff], board[rt][ft])) break;
+		      callback(board, flags, NormalMove,
+			       rf, ff, rt, ft, closure);
+		      if (board[rt][ft] != EmptySquare) break;
+		  }
+	      m++;
+	      goto doRook;
+
 	    // Use Lance as Berolina / Spartan Pawn.
 	    case WhiteLance:
+	      if(gameInfo.variant == VariantSuper) goto Amazon;
 	      if (rf < BOARD_HEIGHT-1 && BlackPiece(board[rf + 1][ff]))
 		  callback(board, flags,
 			   rf >= BOARD_HEIGHT-1-promoRank ? WhitePromotion : NormalMove,
@@ -652,6 +669,7 @@ void GenPseudoLegal(board, flags, callback, closure)
 	      break;
 		
 	    case BlackLance:
+	      if(gameInfo.variant == VariantSuper) goto Amazon;
 	      if (rf > 0 && WhitePiece(board[rf - 1][ff]))
 		  callback(board, flags,
 			   rf <= promoRank ? BlackPromotion : NormalMove,