X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fposition.h;h=48f40dac47e66598b97f1384490861cc6c2ac7aa;hb=d3600c39a745179ed6b094b305d0645e83a1ee86;hp=0099ccd2f8e08f1a6e1b3fb2539da5cdff5b4803;hpb=0d194377033c52ff41ff990ddf31950b576ff543;p=stockfish diff --git a/src/position.h b/src/position.h index 0099ccd2..48f40dac 100644 --- a/src/position.h +++ b/src/position.h @@ -1,13 +1,14 @@ /* - Glaurung, a UCI chess playing engine. - Copyright (C) 2004-2008 Tord Romstad + Stockfish, a UCI chess playing engine derived from Glaurung 2.1 + Copyright (C) 2004-2008 Tord Romstad (Glaurung author) + Copyright (C) 2008 Marco Costalba - Glaurung is free software: you can redistribute it and/or modify + Stockfish is free software: you can redistribute it and/or modify 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. - Glaurung is distributed in the hope that it will be useful, + 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. @@ -171,11 +172,6 @@ public: // Number of pieces of each color and type int piece_count(Color c, PieceType pt) const; - int pawn_count(Color c) const; - int knight_count(Color c) const; - int bishop_count(Color c) const; - int rook_count(Color c) const; - int queen_count(Color c) const; // The en passant square: Square ep_square() const; @@ -491,26 +487,6 @@ inline int Position::piece_count(Color c, PieceType pt) const { return pieceCount[c][pt]; } -inline int Position::pawn_count(Color c) const { - return piece_count(c, PAWN); -} - -inline int Position::knight_count(Color c) const { - return piece_count(c, KNIGHT); -} - -inline int Position::bishop_count(Color c) const { - return piece_count(c, BISHOP); -} - -inline int Position::rook_count(Color c) const { - return piece_count(c, ROOK); -} - -inline int Position::queen_count(Color c) const { - return piece_count(c, QUEEN); -} - inline Square Position::piece_list(Color c, PieceType pt, int index) const { return pieceList[c][pt][index]; } @@ -707,8 +683,8 @@ inline int Position::rule_50_counter() const { inline bool Position::opposite_colored_bishops() const { - return bishop_count(WHITE) == 1 - && bishop_count(BLACK) == 1 + return piece_count(WHITE, BISHOP) == 1 + && piece_count(BLACK, BISHOP) == 1 && square_color(piece_list(WHITE, BISHOP, 0)) != square_color(piece_list(BLACK, BISHOP, 0)); }