currentMoveString[2] - AAA,\r
currentMoveString[4]);\r
\r
- if (currentMoveString[4] == NULLCHAR &&\r
- (result == WhitePromotionKnight || result == BlackPromotionKnight ||\r
- result == WhitePromotionQueen || result == BlackPromotionQueen)) {\r
- if(gameInfo.variant == VariantShatranj || gameInfo.variant == VariantCourier || gameInfo.variant == VariantMakruk)\r
- currentMoveString[4] = PieceToChar(BlackFerz);\r
- else if(gameInfo.variant == VariantGreat)\r
- currentMoveString[4] = PieceToChar(BlackMan);\r
- else\r
- currentMoveString[4] = PieceToChar(BlackQueen);\r
- currentMoveString[5] = NULLCHAR;\r
- }\r
-\r
- return (int) result;\r
-}\r
-\r
+ if (currentMoveString[4] == NULLCHAR) {
+ if(result == WhitePromotionKnight || result == BlackPromotionKnight ||
+ result == WhitePromotionQueen || result == BlackPromotionQueen) {
+ if(gameInfo.variant == VariantShatranj || gameInfo.variant == VariantCourier || gameInfo.variant == VariantMakruk)
+ currentMoveString[4] = PieceToChar(BlackFerz);
+ else if(gameInfo.variant == VariantGreat)
+ currentMoveString[4] = PieceToChar(BlackMan);
+ else
+ currentMoveString[4] = PieceToChar(BlackQueen);
+ currentMoveString[5] = NULLCHAR;
+ }
+ } else if(appData.testLegality && // strip off unnecessary and false promo characters
+ !(result == WhitePromotionQueen || result == BlackPromotionQueen ||
+ result == WhiteNonPromotion || result == BlackNonPromotion)) currentMoveString[4] = NULLCHAR;
+
+ return (int) result;
+}
+
[a-l][0-9]((=?\(?[A-Za-z]\)?)|=)? {\r
/*\r
* Pawn move, possibly with promotion\r