X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=moves.c;h=4ec094482961dc5fc009cc3cff649dcf6a7cb42a;hb=59b7ace7dd899298869a0921c0b9137e233c196b;hp=d0cc65c32d61e21ef445836241a80d6db22ebba7;hpb=ff23924264802924788f2a15c73a8d058e90432e;p=xboard.git

diff --git a/moves.c b/moves.c
index d0cc65c..4ec0944 100644
--- a/moves.c
+++ b/moves.c
@@ -71,7 +71,6 @@ int BlackPiece P((ChessSquare));
 int SameColor P((ChessSquare, ChessSquare));
 int PosFlags(int index);
 
-extern signed char initialRights[BOARD_FILES]; /* [HGM] all rights enabled, set in InitPosition */
 int quickFlag;
 char *pieceDesc[EmptySquare];
 char *defaultDesc[EmptySquare] = {
@@ -121,6 +120,7 @@ unsigned char pieceToChar[EmptySquare+1] = {
                         'o', 'h', 'i', 'j', 'g', 'd', 'v', 'l', 's', 'u', 'k',
                         'x' };
 unsigned char pieceNickName[EmptySquare];
+int promoPartner[EmptySquare];
 
 char
 PieceToChar (ChessSquare p)
@@ -285,7 +285,7 @@ MovesFromString (Board board, int flags, int f, int r, int tx, int ty, int angle
     if(pc == WhitePawn || pc == WhiteLance) promo = WhitePromotion, promoRank = BOARD_HEIGHT-1; else
     if(pc == BlackPawn || pc == BlackLance) promo = BlackPromotion, promoRank = 0;
     while(*p) {                  // more moves to go
-	int expo = 1, dx, dy, x, y, mode, dirSet, ds2=0, retry=0, initial=0, jump=1, skip = 0, all = 0;
+	int expo = -1, dx, dy, x, y, mode, dirSet, ds2=0, retry=0, initial=0, jump=1, skip = 0, all = 0;
 	char *cont = NULL;
 	while(*p == 'i') initial++, desc = ++p;
 	while(islower(*p)) p++;  // skip prefixes
@@ -376,9 +376,10 @@ MovesFromString (Board board, int flags, int f, int r, int tx, int ty, int angle
 	if(initial && (board[r][f] != initialPosition[r][f] ||
 		       r == 0              && board[TOUCHED_W] & 1<<f ||
 		       r == BOARD_HEIGHT-1 && board[TOUCHED_B] & 1<<f   ) ) continue;
-	if(expo > 1 && dx == 0 && dy == 0) {          // castling indicated by O + number
+	if(expo > 0 && dx == 0 && dy == 0) {          // castling indicated by O + number
 	    mode |= 1024; dy = 1;
 	}
+	if(expo < 0) expo = 1;                        // use 1 for default
         if(!cont) {
 	    if(!(mode & 15)) mode |= his + 4;         // no mode spec, use default = mc
 	} else {
@@ -449,7 +450,7 @@ MovesFromString (Board board, int flags, int f, int r, int tx, int ty, int angle
 		    if(occup == 4) continue; // skip empty squares
 		    if((x == BOARD_LEFT + skip || x > BOARD_LEFT + skip && vx < 0 && board[y][x-1-skip] == DarkSquare)
 								    && board[y][x] == initialPosition[y][x]) { // reached initial corner piece
-		      if(pc != WhiteKing && pc != BlackKing) { // non-royal castling (to be entered as two-leg move via 'Rook')
+		      if(pc != WhiteKing && pc != BlackKing || expo == 1) { // non-royal castling (to be entered as two-leg move via 'Rook')
 			if(killX < 0) cb(board, flags, FirstLeg,   r, f, y, x, cl); if(killX < f)
 			legNr <<= 1,  cb(board, flags, NormalMove, r, f, y, f - expo, cl), legNr >>= 1;
 		      } else
@@ -457,7 +458,7 @@ MovesFromString (Board board, int flags, int f, int r, int tx, int ty, int angle
 		    }
 		    if((x == BOARD_RGHT-1-skip || x < BOARD_RGHT-1-skip && vx > 0 && board[y][x+1+skip] == DarkSquare)
 								    && board[y][x] == initialPosition[y][x]) {
-		      if(pc != WhiteKing && pc != BlackKing) {
+		      if(pc != WhiteKing && pc != BlackKing || expo == 1) {
 			if(killX < 0) cb(board, flags, FirstLeg,   r, f, y, x, cl); if(killX > f)
 			legNr <<= 1,  cb(board, flags, NormalMove, r, f, y, f + expo, cl), legNr >>= 1;
 		      } else
@@ -911,8 +912,8 @@ GenPseudoLegal (Board board, int flags, MoveCallback callback, VOIDSTAR closure,
 		break;
 
 
-            case SHOGI WhiteStag:
-            case SHOGI BlackStag:
+            case SHOGI WhiteGnu:
+            case SHOGI BlackGnu:
 		if(gameInfo.variant == VariantShogi) goto BlackGold;
 		SlideVertical(board, flags, rf, ff, callback, closure);
 		Ferz(board, flags, rf, ff, callback, closure);
@@ -1276,7 +1277,7 @@ GenPseudoLegal (Board board, int flags, MoveCallback callback, VOIDSTAR closure,
 		SlideVertical(board, flags, rf, ff, callback, closure);
 		break;
 
-            case SHOGI WhiteHorned:
+            case SHOGI WhiteCat:
 		Sting(board, flags, rf, ff, 1, 0, callback, closure);
 		callback(board, flags, NormalMove, rf, ff, rf, ff, closure);
 		if(killX >= 0) break;
@@ -1285,7 +1286,7 @@ GenPseudoLegal (Board board, int flags, MoveCallback callback, VOIDSTAR closure,
 		SlideBackward(board, flags, rf, ff, callback, closure);
 		break;
 
-            case SHOGI BlackHorned:
+            case SHOGI BlackCat:
 		Sting(board, flags, rf, ff, -1, 0, callback, closure);
 		callback(board, flags, NormalMove, rf, ff, rf, ff, closure);
 		if(killX >= 0) break;
@@ -1294,7 +1295,7 @@ GenPseudoLegal (Board board, int flags, MoveCallback callback, VOIDSTAR closure,
 		SlideForward(board, flags, rf, ff, callback, closure);
 		break;
 
-            case SHOGI WhiteEagle:
+            case SHOGI WhiteDagger:
 		Sting(board, flags, rf, ff, 1,  1, callback, closure);
 		Sting(board, flags, rf, ff, 1, -1, callback, closure);
 		callback(board, flags, NormalMove, rf, ff, rf, ff, closure);
@@ -1303,7 +1304,7 @@ GenPseudoLegal (Board board, int flags, MoveCallback callback, VOIDSTAR closure,
 		SlideDiagBackward(board, flags, rf, ff, callback, closure);
 		break;
 
-            case SHOGI BlackEagle:
+            case SHOGI BlackDagger:
 		Sting(board, flags, rf, ff, -1,  1, callback, closure);
 		Sting(board, flags, rf, ff, -1, -1, callback, closure);
 		callback(board, flags, NormalMove, rf, ff, rf, ff, closure);
@@ -2413,7 +2414,10 @@ CoordsToAlgebraic (Board board, int flags, int rf, int ff, int rt, int ft, int p
 	int r, f;
       for(r=0; r<BOARD_HEIGHT; r++) for(f=BOARD_LEFT; f<=BOARD_RGHT; f++)
  		c += (board[r][f] == piece); // count on-board pieces of given type
-	*outp++ = ToUpper(PieceToChar(piece));
+        *outp = PieceToChar(piece);
+        if(*outp == '+') outp++, piece = CHUDEMOTED(piece);
+        *outp++ = ToUpper(PieceToChar(piece));
+        if(*outp = PieceSuffix(piece)) outp++;
     }
   if(c != 1) { // [HGM] but if there is only one piece of the mentioned type, no from-square, thank you!
     *outp++ = ff + AAA;