X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.h;h=222cd92c9f464a382e40de7093f80f77d675db6e;hp=3da25b6f57e4c6e54b8e62af18c84e9717d385ee;hb=b41b590457d2b57ad6405527e7364531af814440;hpb=324ca87affc4959f7017e83437fb06b6e770449c

diff --git a/src/position.h b/src/position.h
index 3da25b6f..222cd92c 100644
--- a/src/position.h
+++ b/src/position.h
@@ -21,11 +21,8 @@
 #define POSITION_H_INCLUDED
 
 #include "bitboard.h"
-#include "color.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
@@ -107,9 +104,6 @@ struct StateInfo {
 
 class Position {
 
-  friend class MaterialInfo;
-  friend class EndgameFunctions;
-
   Position(); // No default or copy c'tor allowed
   Position(const Position& pos);
 
@@ -190,6 +184,8 @@ public:
   // Properties of moves
   bool pl_move_is_legal(Move m, Bitboard pinned) const;
   bool pl_move_is_evasion(Move m, Bitboard pinned) const;
+  bool move_is_legal(const Move m) const;
+  bool move_is_legal(const Move m, Bitboard pinned) const;
   bool move_is_check(Move m) const;
   bool move_is_check(Move m, const CheckInfo& ci) const;
   bool move_is_capture(Move m) const;
@@ -234,9 +230,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;
 
@@ -306,7 +299,7 @@ private:
   int castleRightsMask[64];
   StateInfo startState;
   File initialKFile, initialKRFile, initialQRFile;
-  bool isChess960;
+  bool chess960;
   int startPosPlyCounter;
   int threadID;
   int64_t nodes;
@@ -434,12 +427,12 @@ inline Square Position::initial_qr_square(Color c) const {
 
 template<>
 inline Bitboard Position::attacks_from<PAWN>(Square s, Color c) const {
-  return NonSlidingAttacksBB[piece_of_color_and_type(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<>
@@ -490,7 +483,7 @@ inline Key Position::get_material_key() const {
 }
 
 inline Score Position::pst(Color c, PieceType pt, Square s) {
-  return PieceSquareTable[piece_of_color_and_type(c, pt)][s];
+  return PieceSquareTable[make_piece(c, pt)][s];
 }
 
 inline Score Position::pst_delta(Piece piece, Square from, Square to) {
@@ -508,7 +501,7 @@ inline Value Position::non_pawn_material(Color c) const {
 inline bool Position::move_is_passed_pawn_push(Move m) const {
 
   Color c = side_to_move();
-  return   piece_on(move_from(m)) == piece_of_color_and_type(c, PAWN)
+  return   piece_on(move_from(m)) == make_piece(c, PAWN)
         && pawn_is_passed(c, move_to(m));
 }
 
@@ -527,7 +520,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 {