X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fevaluate.cpp;h=f1bb861dcca629e08de695df7bb0c8ff4ccf0b2f;hb=79e3710fd224e6e052f6bc5420a8f8f03bf41e18;hp=aeaa4336383960142e77260b7442d17659871bcb;hpb=9b276a6596eec6fbdcdb29d55ea0b15f5057c853;p=stockfish diff --git a/src/evaluate.cpp b/src/evaluate.cpp index aeaa4336..f1bb861d 100644 --- a/src/evaluate.cpp +++ b/src/evaluate.cpp @@ -160,7 +160,6 @@ namespace { constexpr Score KnightOnQueen = S( 20, 12); constexpr Score LongDiagonalBishop = S( 44, 0); constexpr Score MinorBehindPawn = S( 16, 0); - constexpr Score Overload = S( 12, 6); constexpr Score PawnlessFlank = S( 18, 94); constexpr Score RestrictedPiece = S( 7, 6); constexpr Score RookOnPawn = S( 10, 28); @@ -553,10 +552,9 @@ namespace { if (weak & attackedBy[Us][KING]) score += ThreatByKing; - score += Hanging * popcount(weak & ~attackedBy[Them][ALL_PIECES]); - - b = weak & nonPawnEnemies & attackedBy[Them][ALL_PIECES]; - score += Overload * popcount(b); + b = ~attackedBy[Them][ALL_PIECES] + | (nonPawnEnemies & attackedBy2[Us]); + score += Hanging * popcount(weak & b); } // Bonus for restricting their piece moves