X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fevaluate.cpp;h=e7af307303ae3fd447e5b46c553d235ef00552ce;hp=f6a2ed0dcdb0ad3b1d7daf4371f7d6cbe8c12c96;hb=df4b106716f0fb0a5f5887b1cffeb544174008f7;hpb=80bee85d5f48cc1e06f16236a73c86a14c1d0756 diff --git a/src/evaluate.cpp b/src/evaluate.cpp index f6a2ed0d..e7af3073 100644 --- a/src/evaluate.cpp +++ b/src/evaluate.cpp @@ -372,8 +372,8 @@ Value do_evaluate(const Position& pos, EvalInfo& ei) { // colored bishop endgames, and use a lower scale for those if ( phase < PHASE_MIDGAME && pos.opposite_colored_bishops() - && ( (factor[WHITE] == SCALE_FACTOR_NORMAL && eg_value(ei.value) > Value(0)) - || (factor[BLACK] == SCALE_FACTOR_NORMAL && eg_value(ei.value) < Value(0)))) + && ( (factor[WHITE] == SCALE_FACTOR_NORMAL && eg_value(ei.value) > VALUE_ZERO) + || (factor[BLACK] == SCALE_FACTOR_NORMAL && eg_value(ei.value) < VALUE_ZERO))) { ScaleFactor sf; @@ -634,7 +634,7 @@ namespace { const Color Them = (Us == WHITE ? BLACK : WHITE); Bitboard b; - Score bonus = make_score(0, 0); + Score bonus = SCORE_ZERO; // Enemy pieces not defended by a pawn and under our attack Bitboard weakEnemies = pos.pieces_of_color(Them) @@ -1074,7 +1074,7 @@ namespace { assert(ph >= PHASE_ENDGAME && ph <= PHASE_MIDGAME); Value eg = eg_value(v); - ScaleFactor f = sf[eg > Value(0) ? WHITE : BLACK]; + ScaleFactor f = sf[eg > VALUE_ZERO ? WHITE : BLACK]; Value ev = Value((eg * int(f)) / SCALE_FACTOR_NORMAL); int result = (mg_value(v) * int(ph) + ev * int(128 - ph)) / 128;