Small touches in position.h

[stockfish] / src / position.h

diff --git a/src/position.h b/src/position.h
index 2930b8c853fdb7927c911fbc16d5a467dbc87d6e..8f2539013cbd00dd848b3313f5295a4317f092d2 100644 (file)
--- a/src/position.h
+++ b/src/position.h
@@ -283,7 +283,7 @@ inline Piece Position::piece_on(Square s) const {
 }
 
 inline bool Position::square_is_empty(Square s) const {
-  return piece_on(s) == PIECE_NONE;
+  return board[s] == PIECE_NONE;
 }
 
 inline Color Position::side_to_move() const {
@@ -295,7 +295,7 @@ inline Bitboard Position::occupied_squares() const {
 }
 
 inline Bitboard Position::empty_squares() const {
-  return ~occupied_squares();
+  return ~byTypeBB[0];
 }
 
 inline Bitboard Position::pieces(Color c) const {
@@ -376,7 +376,7 @@ inline Bitboard Position::checkers() const {
 }
 
 inline bool Position::in_check() const {
-  return st->checkersBB != EmptyBoardBB;
+  return st->checkersBB != 0;
 }
 
 inline bool Position::pawn_is_passed(Color c, Square s) const {
@@ -417,9 +417,8 @@ 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)) == make_piece(c, PAWN)
-        && pawn_is_passed(c, move_to(m));
+  return   board[move_from(m)] == make_piece(sideToMove, PAWN)
+        && pawn_is_passed(sideToMove, move_to(m));
 }
 
 inline int Position::startpos_ply_counter() const {
@@ -428,9 +427,9 @@ 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
-        && opposite_color_squares(piece_list(WHITE, BISHOP)[0], piece_list(BLACK, BISHOP)[0]);
+  return   pieceCount[WHITE][BISHOP] == 1
+        && pieceCount[BLACK][BISHOP] == 1
+        && opposite_colors(pieceList[WHITE][BISHOP][0], pieceList[BLACK][BISHOP][0]);
 }
 
 inline bool Position::has_pawn_on_7th(Color c) const {