X-Git-Url: http://winboard.nl/cgi-bin?p=capablanca.git;a=blobdiff_plain;f=lasker-2.2.3%2Fsrc%2Falgcheck.c;h=3efc4ce34ed04d60441290a7cb8b5d9645cc0971;hp=d0434450a3cbe6979021a95d9ed03fd38a6b627d;hb=534b15b1773a6f879b0b83fb0cfa0b02b003813c;hpb=707e46a1e2dba3ef53b97c63520d50f4ecc3996b

diff --git a/lasker-2.2.3/src/algcheck.c b/lasker-2.2.3/src/algcheck.c
index d043445..3efc4ce 100644
--- a/lasker-2.2.3/src/algcheck.c
+++ b/lasker-2.2.3/src/algcheck.c
@@ -152,6 +152,8 @@ static int get_move_info(const char *str, int *piece, int *ff, int *fr, int *tf,
 	  lpiece = KNIGHT;
 	else if (c == 'p')
 	  lpiece = PAWN;
+	else if (c == 'd')
+	  lpiece = DRAGONKING;
 	else
 	  goto nomatch;
 	break;
@@ -197,6 +199,7 @@ static int get_move_info(const char *str, int *piece, int *ff, int *fr, int *tf,
     matchVal = i;
 nomatch:;
   }
+
   if (matchVal != -1)
     return MS_ALG;
   else
@@ -219,11 +222,35 @@ static void add_promotion(struct game_state_t *gs, const char *mstr, struct move
 	if (s == NULL) {
 		return;
 	}
-	
+	if(gs->promoType == 3) { // handle Shogi promotions
+		piece = gs->board[mt->fromFile][mt->fromRank];
+ 		if(colorval(piece) == WHITE && mt->fromRank < gs->ranks - gs->ranks/3
+					    && mt->toRank   < gs->ranks - gs->ranks/3 ) return;
+ 		if(colorval(piece) == BLACK && mt->fromRank >= gs->ranks/3
+					    && mt->toRank   >= gs->ranks/3 ) return;
+                switch(piecetype(piece)) {
+		    case PAWN:
+		    case LANCE:
+		    case HONORABLEHORSE:
+		    case SILVER:
+			if(s[1] != '+' && s[1] != '^' && s[1] != 'G' && s[1] != 'g') return;
+			piece = GOLD; break;
+		    case BISHOP:
+			if(s[1] != '+' && s[1] != '^' && s[1] != 'H' && s[1] != 'h') return;
+			piece = DRAGONHORSE; break;
+		    case ROOK:
+			if(s[1] != '+' && s[1] != '^' && s[1] != 'D' && s[1] != 'd') return;
+			piece = DRAGONKING; break;
+		    default: return; // others do not promote, so ignore
+		}
+		mt->piecePromotionTo = piece | colorval(gs->board[mt->fromFile][mt->fromRank]);
+		return;
+ 	}
+
 	if (piecetype(gs->board[mt->fromFile][mt->fromRank]) != PAWN) {
 		return;
 	}
-	if (mt->toRank != gs->ranks-1 && mt->toRank != 0) {
+	if (mt->toRank < gs->ranks - gs->promoZone && mt->toRank >= gs->promoZone) {
 		return;
 	}
 
@@ -278,9 +305,9 @@ static void add_promotion(struct game_state_t *gs, const char *mstr, struct move
 	default:
 		return;
 	}
-
 	i = colorval(gs->board[mt->fromFile][mt->fromRank]) == WHITE ? 0 : 1;
-	if(piece >= WOODY && (gs->promoType != 2 || gs->holding[i][piece-1] == 0)) return;
+	if(gs->promoType == 2 && gs->holding[i][piece-1] == 0) return; // only if piece was captured
+	if(piece >= WOODY && (gs->promoType != 2 || gs->promoZone == 3)) return; // reserved for Superchess
 
 	mt->piecePromotionTo = piece | colorval(gs->board[mt->fromFile][mt->fromRank]);
 }
@@ -295,7 +322,6 @@ int alg_parse_move(char *mstr, struct game_state_t * gs, struct move_t * mt)
     d_printf( "CHESSD: Shouldn't try to algebraicly parse non-algabraic move string.\n");
     return MOVE_ILLEGAL;
   }
-  
   // [HGM] check if move does not stray off board
   if(gs->ranks < 10) { 
     if(tr == 0 || fr == 0) return MOVE_ILLEGAL; // used nonexistent 0-rank
@@ -339,6 +365,7 @@ int alg_parse_move(char *mstr, struct game_state_t * gs, struct move_t * mt)
       break;
     case HORSE:
       if(strstr(gs->variant, "great")) piece = PRIESTESS;
+      if(strstr(gs->variant, "shogi")) piece = DRAGONHORSE;
       break;
     case GOLD:
       if(strstr(gs->variant, "great")) piece = MASTODON;
@@ -403,7 +430,6 @@ int alg_parse_move(char *mstr, struct game_state_t * gs, struct move_t * mt)
 		    // note that the interpretation Bxc4 is matched last, and has set piece to BISHOP
 		    continue;
 	    }
-
 	    if (legal_andcheck_move(gs, f, r, tf, tr)) {
 		    if ((piecetype(gs->board[f][r]) == PAWN) && (f != tolower(mstr[0]) - 'a')) {
 			    continue;
@@ -566,10 +592,10 @@ char *alg_unparse(struct game_state_t * gs, struct move_t * mt)
     strcpy(mStr, "N");
     break;
   case DRAGONKING:
-    strcpy(mStr, "J");
+    strcpy(mStr, "D");
     break;
   case DRAGONHORSE:
-    strcpy(mStr, "I");
+    strcpy(mStr, "H");
     break;
   case LANCE:
     strcpy(mStr, "L");
@@ -656,8 +682,8 @@ char *alg_unparse(struct game_state_t * gs, struct move_t * mt)
   }
   sprintf(tmp, "%c%d", mt->toFile + 'a', mt->toRank + 1 - (gs->ranks > 9));
   strcat(mStr, tmp);
-
-  if ((piece == PAWN) && (mt->piecePromotionTo != NOPIECE)) {
+
+  if ((piece == PAWN || gs->promoType == 3) && (mt->piecePromotionTo != NOPIECE)) {
     strcat(mStr, "=");		/* = before promoting piece */
     switch (piecetype(mt->piecePromotionTo)) {
     case KNIGHT:
@@ -702,6 +728,15 @@ char *alg_unparse(struct game_state_t * gs, struct move_t * mt)
     case MASTODON:
       strcat(mStr, "G");
       break;
+    case GOLD: // [HGM] Shogi promotions: avoid use of '+'
+      strcat(mStr, "G");
+      break;
+    case DRAGONHORSE:
+      strcat(mStr, "H");
+      break;
+    case DRAGONKING:
+      strcat(mStr, "D");
+      break;
     default:
       break;
     }