X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fmovegen.cpp;h=14f30ea00c01b761748ebb54d284c3e3ba0e8c43;hp=15de166e5bcb64f8b7a39c9485a7e403acacc971;hb=820c5c25b649d6bdd51bed14a16efdc11719b588;hpb=6c898a10be75bc2c295a7dca7f72e51e76ec8293 diff --git a/src/movegen.cpp b/src/movegen.cpp index 15de166e..14f30ea0 100644 --- a/src/movegen.cpp +++ b/src/movegen.cpp @@ -99,8 +99,8 @@ namespace { const Bitboard TRank7BB = (Us == WHITE ? Rank7BB : Rank2BB); const Bitboard TRank3BB = (Us == WHITE ? Rank3BB : Rank6BB); const Direction Up = (Us == WHITE ? NORTH : SOUTH); - const Direction Right = (Us == WHITE ? NORTH_EAST : SOUTH_WEST); - const Direction Left = (Us == WHITE ? NORTH_WEST : SOUTH_EAST); + const Direction UpRight = (Us == WHITE ? NORTH_EAST : SOUTH_WEST); + const Direction UpLeft = (Us == WHITE ? NORTH_WEST : SOUTH_EAST); Bitboard emptySquares; @@ -168,38 +168,38 @@ namespace { if (Type == EVASIONS) emptySquares &= target; - Bitboard b1 = shift(pawnsOn7) & enemies; - Bitboard b2 = shift(pawnsOn7) & enemies; - Bitboard b3 = shift(pawnsOn7) & emptySquares; + Bitboard b1 = shift(pawnsOn7) & enemies; + Bitboard b2 = shift(pawnsOn7) & enemies; + Bitboard b3 = shift(pawnsOn7) & emptySquares; Square ksq = pos.square(Them); while (b1) - moveList = make_promotions(moveList, pop_lsb(&b1), ksq); + moveList = make_promotions(moveList, pop_lsb(&b1), ksq); while (b2) - moveList = make_promotions(moveList, pop_lsb(&b2), ksq); + moveList = make_promotions(moveList, pop_lsb(&b2), ksq); while (b3) - moveList = make_promotions(moveList, pop_lsb(&b3), ksq); + moveList = make_promotions(moveList, pop_lsb(&b3), ksq); } // Standard and en-passant captures if (Type == CAPTURES || Type == EVASIONS || Type == NON_EVASIONS) { - Bitboard b1 = shift(pawnsNotOn7) & enemies; - Bitboard b2 = shift(pawnsNotOn7) & enemies; + Bitboard b1 = shift(pawnsNotOn7) & enemies; + Bitboard b2 = shift(pawnsNotOn7) & enemies; while (b1) { Square to = pop_lsb(&b1); - *moveList++ = make_move(to - Right, to); + *moveList++ = make_move(to - UpRight, to); } while (b2) { Square to = pop_lsb(&b2); - *moveList++ = make_move(to - Left, to); + *moveList++ = make_move(to - UpLeft, to); } if (pos.ep_square() != SQ_NONE)