X-Git-Url: http://winboard.nl/cgi-bin?p=capablanca.git;a=blobdiff_plain;f=lasker-2.2.3%2Fsrc%2Falgcheck.c;h=33f6b288fa7856a038ef90d0588095903415aec1;hp=aa7d5af20234175f5e72457413e08fda8c3ca4e7;hb=5317b80b41045bd23473faf4748a9539a06e5f52;hpb=ec7b6bb32ba9632cda17b308808ce9ba1e27c090

diff --git a/lasker-2.2.3/src/algcheck.c b/lasker-2.2.3/src/algcheck.c
index aa7d5af..33f6b28 100644
--- a/lasker-2.2.3/src/algcheck.c
+++ b/lasker-2.2.3/src/algcheck.c
@@ -247,12 +247,14 @@ static void add_promotion(struct game_state_t *gs, const char *mstr, struct move
 		return;
  	}
 
+      if(gs->drops != 2 || (gs->onMove == WHITE ? 0 : gs->ranks-1) != mt->fromRank) { // [HGM] always accept if backrank mover in Seirawan
 	if (piecetype(gs->board[mt->fromFile][mt->fromRank]) != PAWN) {
 		return;
 	}
 	if (mt->toRank < gs->ranks - gs->promoZone && mt->toRank >= gs->promoZone) {
 		return;
 	}
+      }
 
 	switch (tolower(s[1])) {
 	case 'f':
@@ -338,6 +340,7 @@ int alg_parse_move(char *mstr, struct game_state_t * gs, struct move_t * mt)
   switch(piece) {
     case ELEPHANT:
       if(strstr(gs->variant, "super"))   piece = EMPRESS; else
+      if(strstr(gs->variant, "seirawan"))piece = SELEPHANT; else
       if(strstr(gs->variant, "great"))   piece = MODERNELEPHANT; else
       if(strstr(gs->variant, "courier")) piece = ALFIL2;
       break;
@@ -368,8 +371,9 @@ int alg_parse_move(char *mstr, struct game_state_t * gs, struct move_t * mt)
       if(strstr(gs->variant, "great")) piece = MINISTER;
       break;
     case HORSE:
+      if(strstr(gs->variant, "shogi")) piece = DRAGONHORSE; else
+      if(strstr(gs->variant, "seirawan")) piece = HAWK; else
       if(strstr(gs->variant, "great")) piece = PRIESTESS;
-      if(strstr(gs->variant, "shogi")) piece = DRAGONHORSE;
       break;
     case GOLD:
       if(strstr(gs->variant, "great")) piece = MASTODON;
@@ -525,12 +529,18 @@ char *alg_unparse(struct game_state_t * gs, struct move_t * mt)
     piece = piecetype(gs->board[mt->fromFile][mt->fromRank]);
   }
 
-  if ((mt->fromFile == ALG_CASTLE) && (mt->toFile > mt->toRank)) { // [HGM] castle: K ends right of R
-    strcpy(mStr, "O-O");
-    goto check;
-  }
-  if ((mt->fromFile == ALG_CASTLE) && (mt->toFile < mt->toRank)) { // [HGM] castle: K ends left of R
-    strcpy(mStr, "O-O-O");
+  if (mt->fromFile == ALG_CASTLE) {
+    int r = gs->onMove == WHITE ? 1 : gs->ranks;
+    if(mt->toFile > mt->toRank) { // [HGM] castle: K ends right of R
+      strcpy(mStr, "O-O");
+    }
+    if (mt->toFile < mt->toRank) { // [HGM] castle: K ends left of R
+      strcpy(mStr, "O-O-O");
+    }
+    if(gs->drops == 2) {
+	if(mt->piecePromotionTo < 0) snprintf(mStr, 20, "%c%de%d", mt->fromRank + 'a', r, r);
+	goto suffix; // [HGM] in Seirawan castling can have gating suffix
+    }
     goto check;
   }
   strcpy(mStr, "");
@@ -571,6 +581,7 @@ char *alg_unparse(struct game_state_t * gs, struct move_t * mt)
     break;
   case EMPRESS:
   case ELEPHANT:
+  case SELEPHANT:
     strcpy(mStr, "E");
     break;
   case ALFIL:
@@ -590,6 +601,8 @@ char *alg_unparse(struct game_state_t * gs, struct move_t * mt)
     strcpy(mStr, "V");
     break;
   case HORSE:
+  case DRAGONHORSE:
+  case HAWK:
     strcpy(mStr, "H");
     break;
   case HONORABLEHORSE:
@@ -598,9 +611,6 @@ char *alg_unparse(struct game_state_t * gs, struct move_t * mt)
   case DRAGONKING:
     strcpy(mStr, "D");
     break;
-  case DRAGONHORSE:
-    strcpy(mStr, "H");
-    break;
   case LANCE:
     strcpy(mStr, "L");
     break;
@@ -686,10 +696,10 @@ 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 || gs->promoType == 3) && (mt->piecePromotionTo != NOPIECE)) {
+suffix:
+  if ((piece == PAWN || gs->promoType == 3 || gs->drops == 2) && (mt->piecePromotionTo != NOPIECE)) {
     strcat(mStr, "=");		/* = before promoting piece */
-    switch (piecetype(mt->piecePromotionTo)) {
+    switch (piecetype(abs(mt->piecePromotionTo))) {
     case KNIGHT:
       strcat(mStr, "N");
       break;