kate/BadFish
1
0
Fork 0
mirror of https://github.com/sockspls/badfish synced 2025-04-30 00:33:09 +00:00
Code Issues Releases Wiki Activity

Retire ksq from CheckInfo

Browse source 
No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba 2011-06-21 08:52:35 +02:00
parent 018022b866
commit e7413417ce
2 changed files with 12 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/position.cpp
View file

@ -87,8 +87,8 @@ CheckInfo::CheckInfo(const Position& pos) {
Color us = pos.side_to_move(); Color us = pos.side_to_move();
Color them = opposite_color(us); Color them = opposite_color(us);
Square ksq = pos.king_square(them);
ksq = pos.king_square(them);
dcCandidates = pos.discovered_check_candidates(us); dcCandidates = pos.discovered_check_candidates(us);
pinned = pos.pinned_pieces(us); pinned = pos.pinned_pieces(us);
@ -753,7 +753,6 @@ bool Position::move_gives_check(Move m, const CheckInfo& ci) const {
assert(move_is_ok(m)); assert(move_is_ok(m));
assert(ci.dcCandidates == discovered_check_candidates(side_to_move())); assert(ci.dcCandidates == discovered_check_candidates(side_to_move()));
assert(color_of_piece_on(move_from(m)) == side_to_move()); assert(color_of_piece_on(move_from(m)) == side_to_move());
assert(piece_on(ci.ksq) == make_piece(opposite_color(side_to_move()), KING));
Square from = move_from(m); Square from = move_from(m);
Square to = move_to(m); Square to = move_to(m);
@ -768,7 +767,7 @@ bool Position::move_gives_check(Move m, const CheckInfo& ci) const {
{ {
// For pawn and king moves we need to verify also direction // For pawn and king moves we need to verify also direction
if ( (pt != PAWN && pt != KING) if ( (pt != PAWN && pt != KING)
|| !squares_aligned(from, to, ci.ksq)) || !squares_aligned(from, to, king_square(opposite_color(side_to_move()))))
return true; return true;
} }
@ -778,6 +777,7 @@ bool Position::move_gives_check(Move m, const CheckInfo& ci) const {
Color us = side_to_move(); Color us = side_to_move();
Bitboard b = occupied_squares(); Bitboard b = occupied_squares();
Square ksq = king_square(opposite_color(us));
// Promotion with check ? // Promotion with check ?
if (move_is_promotion(m)) if (move_is_promotion(m))
@ -787,13 +787,13 @@ bool Position::move_gives_check(Move m, const CheckInfo& ci) const {
switch (promotion_piece_type(m)) switch (promotion_piece_type(m))
{ {
case KNIGHT: case KNIGHT:
return bit_is_set(attacks_from<KNIGHT>(to), ci.ksq); return bit_is_set(attacks_from<KNIGHT>(to), ksq);
case BISHOP: case BISHOP:
return bit_is_set(bishop_attacks_bb(to, b), ci.ksq); return bit_is_set(bishop_attacks_bb(to, b), ksq);
case ROOK: case ROOK:
return bit_is_set(rook_attacks_bb(to, b), ci.ksq); return bit_is_set(rook_attacks_bb(to, b), ksq);
case QUEEN: case QUEEN:
return bit_is_set(queen_attacks_bb(to, b), ci.ksq); return bit_is_set(queen_attacks_bb(to, b), ksq);
default: default:
assert(false); assert(false);
} }
@ -809,8 +809,8 @@ bool Position::move_gives_check(Move m, const CheckInfo& ci) const {
clear_bit(&b, from); clear_bit(&b, from);
clear_bit(&b, capsq); clear_bit(&b, capsq);
set_bit(&b, to); set_bit(&b, to);
return (rook_attacks_bb(ci.ksq, b) & pieces(ROOK, QUEEN, us)) return (rook_attacks_bb(ksq, b) & pieces(ROOK, QUEEN, us))
||(bishop_attacks_bb(ci.ksq, b) & pieces(BISHOP, QUEEN, us)); ||(bishop_attacks_bb(ksq, b) & pieces(BISHOP, QUEEN, us));
} }
// Castling with check ? // Castling with check ?
@ -832,7 +832,7 @@ bool Position::move_gives_check(Move m, const CheckInfo& ci) const {
clear_bit(&b, rfrom); clear_bit(&b, rfrom);
set_bit(&b, rto); set_bit(&b, rto);
set_bit(&b, kto); set_bit(&b, kto);
return bit_is_set(rook_attacks_bb(rto, b), ci.ksq); return bit_is_set(rook_attacks_bb(rto, b), ksq);
} }
return false; return false;
@ -1062,10 +1062,10 @@ void Position::do_move(Move m, StateInfo& newSt, const CheckInfo& ci, bool moveI
if (ci.dcCandidates && bit_is_set(ci.dcCandidates, from)) if (ci.dcCandidates && bit_is_set(ci.dcCandidates, from))
{ {
if (pt != ROOK) if (pt != ROOK)
st->checkersBB |= (attacks_from<ROOK>(ci.ksq) & pieces(ROOK, QUEEN, us)); st->checkersBB |= (attacks_from<ROOK>(king_square(them)) & pieces(ROOK, QUEEN, us));
if (pt != BISHOP) if (pt != BISHOP)
st->checkersBB |= (attacks_from<BISHOP>(ci.ksq) & pieces(BISHOP, QUEEN, us)); st->checkersBB |= (attacks_from<BISHOP>(king_square(them)) & pieces(BISHOP, QUEEN, us));
} }
} }
} }

1
src/position.h
View file

@ -43,7 +43,6 @@ struct CheckInfo {
Bitboard dcCandidates; Bitboard dcCandidates;
Bitboard pinned; Bitboard pinned;
Bitboard checkSq[8]; Bitboard checkSq[8];
Square ksq;
}; };
/// Castle rights, encoded as bit fields /// Castle rights, encoded as bit fields