X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fposition.h;h=8fc62c9894d614af730d9e2d405a9da991362d0d;hp=4e15bb136f9997d98e9e070243d142b9836efca2;hb=0a1092f64eb9eb232094036086fc5c98ed1f3c46;hpb=b71cedb2b009adfd19e9f25c298ac6bd0304dcfc diff --git a/src/position.h b/src/position.h index 4e15bb13..8fc62c98 100644 --- a/src/position.h +++ b/src/position.h @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008-2013 Marco Costalba, Joona Kiiski, Tord Romstad + Copyright (C) 2008-2014 Marco Costalba, Joona Kiiski, Tord Romstad Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -141,7 +141,7 @@ public: void undo_null_move(); // Static exchange evaluation - int see(Move m, int asymmThreshold = 0) const; + int see(Move m) const; int see_sign(Move m) const; // Accessing hash keys @@ -174,7 +174,7 @@ private: // Helper functions void do_castling(Square kfrom, Square kto, Square rfrom, Square rto); - Bitboard hidden_checkers(Color c, Color kingColor) const; + Bitboard check_blockers(Color c, Color kingColor) const; void put_piece(Square s, Color c, PieceType pt); void remove_piece(Square s, Color c, PieceType pt); void move_piece(Square from, Square to, Color c, PieceType pt); @@ -315,11 +315,11 @@ inline Bitboard Position::checkers() const { } inline Bitboard Position::discovered_check_candidates() const { - return hidden_checkers(sideToMove, ~sideToMove); + return check_blockers(sideToMove, ~sideToMove); } inline Bitboard Position::pinned_pieces(Color c) const { - return hidden_checkers(c, c); + return check_blockers(c, c); } inline bool Position::pawn_passed(Color c, Square s) const { @@ -379,7 +379,7 @@ inline bool Position::is_chess960() const { inline bool Position::capture_or_promotion(Move m) const { assert(is_ok(m)); - return type_of(m) ? type_of(m) != CASTLING : !empty(to_sq(m)); + return type_of(m) != NORMAL ? type_of(m) != CASTLING : !empty(to_sq(m)); } inline bool Position::capture(Move m) const {