X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fevaluate.cpp;h=168b99614724fabf45c1b6ca3b06c4ad905ce71a;hp=0bf64631c9d4a8686554619b43eb813c4c94de91;hb=3713bb26efa7466e8eed1bd6361b9cca8b16b449;hpb=cff9ff21985edcf1d15e7df6c0e0039f550706ad diff --git a/src/evaluate.cpp b/src/evaluate.cpp index 0bf64631..168b9961 100644 --- a/src/evaluate.cpp +++ b/src/evaluate.cpp @@ -550,16 +550,15 @@ namespace { ei.kingAdjacentZoneAttacksCount[Us] += count_1s_max_15(bb); } - // The squares occupied by enemy pieces will be counted two times instead - // of one. The shift (almost) guarantees that intersection with b is zero - // so when we 'or' the two bitboards togheter and count we get the correct - // sum of '1' in b and attacked bitboards. - Bitboard attacked = Us == WHITE ? ((b & pos.pieces_of_color(Them)) >> 1) - : ((b & pos.pieces_of_color(Them)) << 1); - // Remove squares protected by enemy pawns or occupied by our pieces b &= ~(ei.attackedBy[Them][PAWN] | pos.pieces_of_color(Us)); + // The squares occupied by enemy pieces (not defended by pawns) will be + // counted two times instead of one. The shift (almost) guarantees that + // intersection with b is zero so when we 'or' the two bitboards togheter + // and count we get the correct sum of '1' in b and attacked bitboards. + Bitboard attacked = Us == WHITE ? ((b & pos.pieces_of_color(Them)) >> 1) + : ((b & pos.pieces_of_color(Them)) << 1); // Mobility int mob = (Piece != QUEEN ? count_1s_max_15(b | attacked) : count_1s(b | attacked));