X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fposition.h;h=7392b9eabd795e39a02a2e12f4470c71ddf69656;hb=0fcda095df1caa860e8e3f3a714d5545ec9dc122;hp=340cbdb1e9c0a25a0eead1e7945d9dafb9dccc7d;hpb=1e7aaed8bc4247a742d515811f0e484ff40309b8;p=stockfish
diff --git a/src/position.h b/src/position.h
index 340cbdb1..7392b9ea 100644
--- a/src/position.h
+++ b/src/position.h
@@ -17,36 +17,18 @@
along with this program. If not, see .
*/
-
#if !defined(POSITION_H_INCLUDED)
#define POSITION_H_INCLUDED
-////
-//// Includes
-////
-
#include "bitboard.h"
-#include "color.h"
#include "move.h"
-#include "piece.h"
-#include "square.h"
-#include "value.h"
-
-
-////
-//// Constants
-////
+#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
/// move counter for every non-reversible move).
const int MaxGameLength = 220;
-
-////
-//// Types
-////
-
class Position;
/// struct checkInfo is initialized at c'tor time and keeps
@@ -222,8 +204,7 @@ public:
bool square_is_weak(Square s, Color c) const;
// Doing and undoing moves
- void detach();
- void do_setup_move(Move m, StateInfo& St);
+ void do_setup_move(Move m);
void do_move(Move m, StateInfo& st);
void do_move(Move m, StateInfo& st, const CheckInfo& ci, bool moveIsCheck);
void undo_move(Move m);
@@ -278,6 +259,7 @@ private:
// Initialization helper functions (used while setting up a position)
void clear();
+ void detach();
void put_piece(Piece p, Square s);
void do_allow_oo(Color c);
void do_allow_ooo(Color c);
@@ -339,11 +321,6 @@ private:
static const Value PieceValueEndgame[17];
};
-
-////
-//// Inline functions
-////
-
inline int64_t Position::nodes_searched() const {
return nodes;
}
@@ -454,7 +431,7 @@ inline Square Position::initial_qr_square(Color c) const {
template<>
inline Bitboard Position::attacks_from(Square s, Color c) const {
- return NonSlidingAttacksBB[piece_of_color_and_type(c, PAWN)][s];
+ return NonSlidingAttacksBB[make_piece(c, PAWN)][s];
}
template // Knight and King and white pawns
@@ -510,7 +487,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) {
@@ -528,7 +505,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));
}
@@ -538,13 +515,12 @@ inline int Position::startpos_ply_counter() const {
inline bool Position::opposite_colored_bishops() const {
- return piece_count(WHITE, BISHOP) == 1
- && piece_count(BLACK, BISHOP) == 1
- && !same_color_squares(piece_list(WHITE, BISHOP, 0), piece_list(BLACK, BISHOP, 0));
+ return piece_count(WHITE, BISHOP) == 1 && piece_count(BLACK, BISHOP) == 1
+ && opposite_color_squares(piece_list(WHITE, BISHOP, 0), piece_list(BLACK, BISHOP, 0));
}
inline bool Position::has_pawn_on_7th(Color c) const {
- return pieces(PAWN, c) & relative_rank_bb(c, RANK_7);
+ return pieces(PAWN, c) & rank_bb(relative_rank(c, RANK_7));
}
inline bool Position::is_chess960() const {