X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.h;h=a47098a8d61d200284bf0ab6dc0632cc73871594;hp=48f40dac47e66598b97f1384490861cc6c2ac7aa;hb=74f1efee263aadcceb1df716ebd87776b932238a;hpb=d3600c39a745179ed6b094b305d0645e83a1ee86

diff --git a/src/position.h b/src/position.h
index 48f40dac..a47098a8 100644
--- a/src/position.h
+++ b/src/position.h
@@ -7,12 +7,12 @@
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
-  
+
   Stockfish is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
-  
+
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
@@ -25,8 +25,8 @@
 #if defined(_MSC_VER)
 
 // Forcing value to bool 'true' or 'false' (performance warning)
-#pragma warning(disable: 4800) 
-
+#pragma warning(disable: 4800)
+
 #endif
 
 ////
@@ -48,7 +48,7 @@
 ////
 
 /// FEN string for the initial position:
-const std::string StartPosition = 
+const std::string StartPosition =
   "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1";
 
 /// Maximum number of plies per game (220 should be enough, because the
@@ -64,9 +64,9 @@ const int MaxGameLength = 220;
 /// Castle rights, encoded as bit fields:
 
 enum CastleRights {
-  NO_CASTLES = 0, 
+  NO_CASTLES = 0,
   WHITE_OO = 1,
-  BLACK_OO = 2, 
+  BLACK_OO = 2,
   WHITE_OOO = 4,
   BLACK_OOO = 8,
   ALL_CASTLES = 15
@@ -92,7 +92,7 @@ struct UndoInfo {
 
 
 /// The position data structure.  A position consists of the following data:
-///    
+///
 ///    * For each piece type, a bitboard representing the squares occupied
 ///      by pieces of that type.
 ///    * For each color, a bitboard representing the squares occupiecd by
@@ -217,8 +217,8 @@ public:
   bool piece_attacks_square(Square f, Square t) const; // Dispatch at run-time
 
   // Properties of moves
-  bool move_is_legal(Move m) const;
-  bool move_is_legal(Move m, Bitboard pinned) const;
+  bool pl_move_is_legal(Move m) const;
+  bool pl_move_is_legal(Move m, Bitboard pinned) const;
   bool move_is_check(Move m) const;
   bool move_is_check(Move m, Bitboard dcCandidates) const;
   bool move_is_capture(Move m) const;
@@ -281,7 +281,7 @@ public:
 
   // Reset the gamePly variable to 0
   void reset_game_ply();
-  
+
   // Position consistency check, for debugging
   bool is_ok(int* failedStep = NULL) const;
 
@@ -305,6 +305,9 @@ private:
   void undo_ep_move(Move m);
   void find_checkers();
 
+  template<PieceType Piece, bool FindPinned>
+  Bitboard hidden_checks(Color c, Square ksq) const;
+
   // Computing hash keys from scratch (for initialization and debugging)
   Key compute_key() const;
   Key compute_pawn_key() const;
@@ -326,7 +329,7 @@ private:
 
   // Piece counts
   int pieceCount[2][8]; // [color][pieceType]
-  
+
   // Piece lists
   Square pieceList[2][8][16]; // [color][pieceType][index]
   int index[64];
@@ -553,7 +556,7 @@ inline Bitboard Position::checkers() const {
 }
 
 inline bool Position::is_check() const {
-  return checkers() != EmptyBoardBB;
+  return checkersBB != EmptyBoardBB;
 }
 
 inline bool Position::pawn_attacks_square(Color c, Square f, Square t) const {
@@ -588,7 +591,7 @@ inline bool Position::file_is_half_open(Color c, File f) const {
 inline bool Position::square_is_weak(Square s, Color c) const {
   return !(pawns(c) & outpost_mask(opposite_color(c), s));
 }
-                                
+
 inline Key Position::get_key() const {
   return key;
 }
@@ -639,7 +642,7 @@ inline Phase Position::game_phase() const {
   static const Value EndgameLimit = 4 * RookValueMidgame - Value(325);
 
   Value npm = non_pawn_material(WHITE) + non_pawn_material(BLACK);
-  
+
   if (npm >= MidgameLimit)
       return PHASE_MIDGAME;
   else if(npm <= EndgameLimit)
@@ -684,7 +687,7 @@ inline int Position::rule_50_counter() const {
 inline bool Position::opposite_colored_bishops() const {
 
   return   piece_count(WHITE, BISHOP) == 1
-        && piece_count(BLACK, BISHOP) == 1        
+        && piece_count(BLACK, BISHOP) == 1
         && square_color(piece_list(WHITE, BISHOP, 0)) != square_color(piece_list(BLACK, BISHOP, 0));
 }
 
@@ -692,6 +695,6 @@ inline bool Position::has_pawn_on_7th(Color c) const {
 
   return pawns(c) & relative_rank_bb(c, RANK_7);
 }
-                   
+
 
 #endif // !defined(POSITION_H_INCLUDED)