X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fbook.cpp;h=0cf4ed0d6c262d97228cc427ac59d3a384e71dfd;hp=ed5cba4b0eb208b7b3ae3eff52226fe0013c5c3b;hb=53ccba8457231677897f531ff283136edc550cf2;hpb=7ac6e3b8506f54ddb8fb6560fbf238242627a141 diff --git a/src/book.cpp b/src/book.cpp index ed5cba4b..0cf4ed0d 100644 --- a/src/book.cpp +++ b/src/book.cpp @@ -455,18 +455,16 @@ Move Book::get_move(const Position& pos, bool findBestMove) { // book move is a promotion we have to convert to our representation, in // all other cases we can directly compare with a Move after having // masked out special Move's flags that are not supported by PolyGlot. - int p = (bookMove >> 12) & 7; + int promotion = (bookMove >> 12) & 7; - if (p) + if (promotion) bookMove = int(make_promotion_move(move_from(Move(bookMove)), - move_to(Move(bookMove)), PieceType(p + 1))); - - // Verify the book move (if any) is legal - MoveStack mlist[MAX_MOVES]; - MoveStack* last = generate(pos, mlist); - for (MoveStack* cur = mlist; cur != last; cur++) - if ((int(cur->move) & ~(3 << 14)) == bookMove) // Mask out special flags - return cur->move; + move_to(Move(bookMove)), + PieceType(promotion + 1))); + // Verify the book move is legal + for (MoveList ml(pos); !ml.end(); ++ml) + if ((ml.move() & ~(3 << 14)) == bookMove) // Mask out special flags + return ml.move(); return MOVE_NONE; }