X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpawns.h;h=664bce2d82dd2cf94a2b13911794642e1f45cc7b;hp=3ec62334c96d28cbf68e0a4184d3c4f5da2df780;hb=bcbc9bfd1f5efeaa3f1e0b020e405f11984e72ec;hpb=3e4dfb49a747be902d25ae06783f98ba29fb5030

diff --git a/src/pawns.h b/src/pawns.h
index 3ec62334..664bce2d 100644
--- a/src/pawns.h
+++ b/src/pawns.h
@@ -37,10 +37,12 @@ struct Entry {
   Score pawns_value() const { return value; }
   Bitboard pawn_attacks(Color c) const { return pawnAttacks[c]; }
   Bitboard passed_pawns(Color c) const { return passedPawns[c]; }
-  int file_is_half_open(Color c, File f) const { return halfOpenFiles[c] & (1 << int(f)); }
-  int has_open_file_to_left(Color c, File f) const { return halfOpenFiles[c] & ((1 << int(f)) - 1); }
-  int has_open_file_to_right(Color c, File f) const { return halfOpenFiles[c] & ~((1 << int(f+1)) - 1); }
-  int same_colored_pawn_count(Square s, Color c) const { return (BlackSquares & s) ? pawnsOnBlackSquaresCount[c] : pawnsOnWhiteSquaresCount[c]; } 
+  int pawns_on_same_color_squares(Color c, Square s) const { return pawnsOnSquares[c][!!(BlackSquares & s)]; }
+  int half_open(Color c, File f) const { return halfOpenFiles[c] & (1 << int(f)); }
+  int half_open_on_side(Color c, File f, bool left) const {
+
+    return halfOpenFiles[c] & (left ? ((1 << int(f)) - 1) : ~((1 << int(f+1)) - 1));
+  }
 
   template<Color Us>
   Score king_safety(const Position& pos, Square ksq)  {
@@ -64,8 +66,7 @@ struct Entry {
   Score value;
   int halfOpenFiles[COLOR_NB];
   Score kingSafety[COLOR_NB];
-  int pawnsOnWhiteSquaresCount[COLOR_NB];
-  int pawnsOnBlackSquaresCount[COLOR_NB];
+  int pawnsOnSquares[COLOR_NB][COLOR_NB];
 };
 
 typedef HashTable<Entry, 16384> Table;