Fix multi-leg promotions

[xboard.git] / pgntags.c

diff --git a/pgntags.c b/pgntags.c
index 8b55af6..9833d10 100644 (file)
--- a/pgntags.c
+++ b/pgntags.c
@@ -1,7 +1,8 @@
 /*
  * pgntags.c -- Functions to manage PGN tags
  *
- * Copyright 1995, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
+ * Copyright 1995, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Free
+ * Software Foundation, Inc.
  *
  * Enhancements Copyright 2005 Alessandro Scotti
  *
@@ -114,8 +115,11 @@ ParsePGNTag (char *tag, GameInfo *gameInfo)
        success = TRUE;
     } else if (StrCaseCmp(name, "Variant") == 0) {
         /* xboard-defined extension */
-        gameInfo->variant = StringToVariant(value);
-       success = TRUE;
+       success = StrSavePtr(value, &gameInfo->variantName) != NULL;
+        if(*value && strcmp(value, engineVariant)) // keep current engine-defined variant if it matches
+            gameInfo->variant = StringToVariant(value);
+    } else if (StrCaseCmp(name, "VariantMen") == 0) {
+        success = LoadPieceDesc(value);
     } else if (StrCaseCmp(name, PGN_OUT_OF_BOOK) == 0) {
         /* [AS] Out of book annotation */
         success = StrSavePtr(value, &gameInfo->outOfBook) != NULL;
@@ -144,6 +148,7 @@ ParsePGNTag (char *tag, GameInfo *gameInfo)
 void
 PrintPGNTags (FILE *fp, GameInfo *gameInfo)
 {
+    char *p;
     fprintf(fp, "[Event \"%s\"]\n", gameInfo->event ? gameInfo->event : "?");
     fprintf(fp, "[Site \"%s\"]\n", gameInfo->site ? gameInfo->site : "?");
     fprintf(fp, "[Date \"%s\"]\n", gameInfo->date ? gameInfo->date : "?");
@@ -159,6 +164,8 @@ PrintPGNTags (FILE *fp, GameInfo *gameInfo)
        fprintf(fp, "[TimeControl \"%s\"]\n", gameInfo->timeControl);
     if (gameInfo->variant != VariantNormal)
         fprintf(fp, "[Variant \"%s\"]\n", VariantName(gameInfo->variant));
+    if (*(p = CollectPieceDescriptors()))
+        fprintf(fp, "[VariantMen \"%s\"]\n", p);
     if (gameInfo->extraTags)
        fputs(gameInfo->extraTags, fp);
 }