Revert previous patch

[stockfish] / src / evaluate.cpp

diff --git a/src/evaluate.cpp b/src/evaluate.cpp
index c8ccaf9c8312d0a3c062ee294a7e519153ef70a3..80bec8746f8bd8edd7bd6db869c9c5b31b439e90 100644 (file)
--- a/src/evaluate.cpp
+++ b/src/evaluate.cpp
@@ -207,7 +207,6 @@ namespace {
 
   // Bonuses for enemy's safe checks
   const int QueenContactCheckBonus = 3;
-  const int DiscoveredCheckBonus   = 3;
   const int QueenCheckBonus        = 2;
   const int RookCheckBonus         = 1;
   const int BishopCheckBonus       = 1;
@@ -862,8 +861,7 @@ namespace {
         // value if the other side has a rook or queen.
         if (square_file(s) == FILE_A || square_file(s) == FILE_H)
         {
-            if (   pos.non_pawn_material(Them) <= KnightValueMidgame
-                && pos.piece_count(Them, KNIGHT) <= 1)
+            if (pos.non_pawn_material(Them) <= KnightValueMidgame)
                 ebonus += ebonus / 4;
             else if (pos.pieces(ROOK, QUEEN, Them))
                 ebonus -= ebonus / 4;
@@ -896,7 +894,7 @@ namespace {
             Square s = pop_1st_bit(&b);
             Square queeningSquare = relative_square(c, make_square(square_file(s), RANK_8));
             int d =  square_distance(s, queeningSquare)
-                   - (relative_rank(c, s) == RANK_2) // Double pawn push
+                   - int(relative_rank(c, s) == RANK_2) // Double pawn push
                    - square_distance(pos.king_square(opposite_color(c)), queeningSquare)
                    + int(c != pos.side_to_move());