X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fpawns.cpp;h=f8918cfeaa0e79683adcf344d51b37fee1af9d5f;hb=bc54a44010e7a7fb55ee55afba65be029a9e423a;hp=3ad88fb206aa011ece4fb6dca4c75acf17edb758;hpb=8447248705bc6cf91fc8cdbb519c31925862ea74;p=stockfish diff --git a/src/pawns.cpp b/src/pawns.cpp index 3ad88fb2..f8918cfe 100644 --- a/src/pawns.cpp +++ b/src/pawns.cpp @@ -127,10 +127,10 @@ Score PawnInfoTable::evaluate_pawns(const Position& pos, Bitboard ourPawns, Rank r; bool passed, isolated, doubled, opposed, chain, backward, candidate; Score value = SCORE_ZERO; - const Square* ptr = pos.piece_list_begin(Us, PAWN); + const Square* pl = pos.piece_list(Us, PAWN); // Loop through all pawns of the current color and score each pawn - while ((s = *ptr++) != SQ_NONE) + while ((s = *pl++) != SQ_NONE) { assert(pos.piece_on(s) == make_piece(Us, PAWN)); @@ -230,7 +230,7 @@ Score PawnInfo::updateShelter(const Position& pos, Square ksq) { for (int i = 0; i < 3; i++) { r += Shift; - shelter += BitCount8Bit[(pawns >> r) & 0xFF] * (64 >> i); + shelter += BitCount8Bit[(pawns >> r) & 0xFF] << (6 - i); } } kingSquares[Us] = ksq;