Remove unreachable extension condition

[stockfish] / src / pawns.cpp

diff --git a/src/pawns.cpp b/src/pawns.cpp
index 795e31e2423941a3a973187d83c2d2b080b353c8..6923d20b31d8bbfdf87ac26c7bd36e3555b032f4 100644 (file)
--- a/src/pawns.cpp
+++ b/src/pawns.cpp
@@ -152,8 +152,8 @@ Score PawnTable::evaluate_pawns(const Position& pos, Bitboard ourPawns,
       // chain (but not the backward one).
       chain    =   ourPawns   & adjacent_files_bb(f) & b;
       isolated = !(ourPawns   & adjacent_files_bb(f));
-      doubled  =   ourPawns   & squares_in_front_of(Us, s);
-      opposed  =   theirPawns & squares_in_front_of(Us, s);
+      doubled  =   ourPawns   & forward_bb(Us, s);
+      opposed  =   theirPawns & forward_bb(Us, s);
       passed   = !(theirPawns & passed_pawn_mask(Us, s));
 
       // Test for backward pawn
@@ -260,6 +260,7 @@ template<Color Us>
 Score PawnEntry::update_safety(const Position& pos, Square ksq) {
 
   kingSquares[Us] = ksq;
+  castleRights[Us] = pos.can_castle(Us);
 
   if (relative_rank(Us, ksq) > RANK_4)
       return kingSafety[Us] = SCORE_ZERO;
@@ -267,10 +268,10 @@ Score PawnEntry::update_safety(const Position& pos, Square ksq) {
   Value bonus = shelter_storm<Us>(pos, ksq);
 
   // If we can castle use the bonus after the castle if is bigger
-  if (pos.can_castle(Us == WHITE ? WHITE_OO : BLACK_OO))
+  if (pos.can_castle(make_castle_right(Us, KING_SIDE)))
       bonus = std::max(bonus, shelter_storm<Us>(pos, relative_square(Us, SQ_G1)));
 
-  if (pos.can_castle(Us == WHITE ? WHITE_OOO : BLACK_OOO))
+  if (pos.can_castle(make_castle_right(Us, QUEEN_SIDE)))
       bonus = std::max(bonus, shelter_storm<Us>(pos, relative_square(Us, SQ_C1)));
 
   return kingSafety[Us] = make_score(bonus, 0);