if (currentMoveString[4] == NULLCHAR &&\r
(result == WhitePromotionKnight || result == BlackPromotionKnight ||\r
result == WhitePromotionQueen || result == BlackPromotionQueen)) {\r
- if(gameInfo.variant == VariantShatranj || gameInfo.variant == VariantCourier)\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
result == WhitePromotionKnight || result == BlackPromotionKnight)) {\r
currentMoveString[4] = PieceToChar(BlackQueen);\r
// [HGM] shatranj: take care of variants without Queen\r
- if(gameInfo.variant == VariantShatranj || gameInfo.variant == VariantCourier)\r
+ if(gameInfo.variant == VariantShatranj || gameInfo.variant == VariantCourier || gameInfo.variant == VariantMakruk)\r
currentMoveString[4] = PieceToChar(BlackFerz);\r
if(gameInfo.variant == VariantGreat)\r
currentMoveString[4] = PieceToChar(BlackMan);\r
ft = BOARD_LEFT+2;\r
}\r
}\r
- if(gameInfo.variant == VariantFischeRandom) {\r
+ if(PosFlags(0) & F_FRC_TYPE_CASTLING) {
if (WhiteOnMove(yyboardindex)) {\r
ff = initialRights[2];\r
ft = initialRights[1];\r
ft = BOARD_RGHT-2;\r
}\r
}\r
- if(gameInfo.variant == VariantFischeRandom) {\r
+ if(PosFlags(0) & F_FRC_TYPE_CASTLING) {
if (WhiteOnMove(yyboardindex)) {\r
ff = initialRights[2];\r
ft = initialRights[0];\r
\r
/* Parse a move from the given string s */\r
/* ^ at start of pattern WON'T work here unless using flex */\r
-ChessMove yylexstr(boardIndex, s)\r
- int boardIndex;\r
- char *s;\r
-{\r
+ChessMove yylexstr(boardIndex, s, text, len)\r
+ int boardIndex, len;\r
+ char *s, *text;\r
+{
ChessMove ret;\r
char *oldStringToLex;\r
#ifdef FLEX_SCANNER\r
yy_switch_to_buffer(buffer);\r
#endif /*FLEX_SCANNER*/\r
\r
- ret = (ChessMove) yylex();\r
+ ret = (ChessMove) yylex();
+ strncpy(text, yy_text, len-1); // [HGM] vari: yy_text is not available to caller after buffer switch ?!?
+ text[len-1] = NULLCHAR;\r
\r
#ifdef FLEX_SCANNER\r
if (oldBuffer != NULL) \r