Refactor pawns shelter and storm

[stockfish] / src / pawns.h

diff --git a/src/pawns.h b/src/pawns.h
index f2b4441a5d46259909acf06fa91ecb20d644b524..1e49a307f64d3748ea742a618869585b0cc46fdb 100644 (file)
--- a/src/pawns.h
+++ b/src/pawns.h
@@ -46,11 +46,14 @@ public:
   int has_open_file_to_right(Color c, File f) const;
 
   template<Color Us>
-  Score king_shelter(const Position& pos, Square ksq);
+  Score king_safety(const Position& pos, Square ksq);
 
 private:
   template<Color Us>
-  Score updateShelter(const Position& pos, Square ksq);
+  Score update_safety(const Position& pos, Square ksq);
+
+  template<Color Us>
+  int shelter_storm(const Position& pos, Square ksq);
 
   Key key;
   Bitboard passedPawns[2];
@@ -100,8 +103,8 @@ inline int PawnInfo::has_open_file_to_right(Color c, File f) const {
 }
 
 template<Color Us>
-inline Score PawnInfo::king_shelter(const Position& pos, Square ksq) {
-  return kingSquares[Us] == ksq ? kingShelters[Us] : updateShelter<Us>(pos, ksq);
+inline Score PawnInfo::king_safety(const Position& pos, Square ksq) {
+  return kingSquares[Us] == ksq ? kingShelters[Us] : update_safety<Us>(pos, ksq);
 }
 
 #endif // !defined(PAWNS_H_INCLUDED)