X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fposition.h;h=80e42aa8ff5c33536b3af1d5f854eb45b6fe60a6;hb=6738b65be97af10e4b5b783dc8ad21ae0faf36a8;hp=91604e94a81d12f1068c3db6b7a62e54f30fd8f3;hpb=95212222c7444538b84326208e433ac12f15e9fb;p=stockfish

diff --git a/src/position.h b/src/position.h
index 91604e94..80e42aa8 100644
--- a/src/position.h
+++ b/src/position.h
@@ -22,9 +22,7 @@
 
 #include "bitboard.h"
 #include "move.h"
-#include "piece.h"
-#include "square.h"
-#include "value.h"
+#include "types.h"
 
 /// Maximum number of plies per game (220 should be enough, because the
 /// maximum search depth is 100, and during position setup we reset the
@@ -233,9 +231,6 @@ public:
   bool is_mate() const;
   bool is_draw() const;
 
-  // Check if side to move could be mated in one
-  bool has_mate_threat();
-
   // Number of plies from starting position
   int startpos_ply_counter() const;
 
@@ -305,7 +300,7 @@ private:
   int castleRightsMask[64];
   StateInfo startState;
   File initialKFile, initialKRFile, initialQRFile;
-  bool isChess960;
+  bool chess960;
   int startPosPlyCounter;
   int threadID;
   int64_t nodes;
@@ -433,12 +428,12 @@ inline Square Position::initial_qr_square(Color c) const {
 
 template<>
 inline Bitboard Position::attacks_from<PAWN>(Square s, Color c) const {
-  return NonSlidingAttacksBB[make_piece(c, PAWN)][s];
+  return StepAttacksBB[make_piece(c, PAWN)][s];
 }
 
 template<PieceType Piece> // Knight and King and white pawns
 inline Bitboard Position::attacks_from(Square s) const {
-  return NonSlidingAttacksBB[Piece][s];
+  return StepAttacksBB[Piece][s];
 }
 
 template<>
@@ -526,7 +521,7 @@ inline bool Position::has_pawn_on_7th(Color c) const {
 }
 
 inline bool Position::is_chess960() const {
-  return isChess960;
+  return chess960;
 }
 
 inline bool Position::move_is_capture(Move m) const {