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

Position::gives_check - use ci.ksq

Browse source 
Also remove a couple of local variables while
there.

No functional change.
This commit is contained in:
Henri Wiechers 2014-01-07 17:55:32 +02:00 • committed by Marco Costalba
parent 6a6fd0b5f5
commit 262c380c4b
1 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/position.cpp
View file

@ -633,20 +633,17 @@ bool Position::gives_check(Move m, const CheckInfo& ci) const {
// Is there a discovered check? // Is there a discovered check?
if ( unlikely(ci.dcCandidates) if ( unlikely(ci.dcCandidates)
&& (ci.dcCandidates & from) && (ci.dcCandidates & from)
&& !aligned(from, to, king_square(~sideToMove))) && !aligned(from, to, ci.ksq))
return true; return true;
// Can we skip the ugly special cases? // Can we skip the ugly special cases?
if (type_of(m) == NORMAL) if (type_of(m) == NORMAL)
return false; return false;
Color us = sideToMove;
Square ksq = king_square(~us);
switch (type_of(m)) switch (type_of(m))
{ {
case PROMOTION: case PROMOTION:
return attacks_bb(Piece(promotion_type(m)), to, pieces() ^ from) & ksq; return attacks_bb(Piece(promotion_type(m)), to, pieces() ^ from) & ci.ksq;
// En passant capture with check? We have already handled the case // En passant capture with check? We have already handled the case
// of direct checks and ordinary discovered check, so the only case we // of direct checks and ordinary discovered check, so the only case we
@ -657,18 +654,18 @@ bool Position::gives_check(Move m, const CheckInfo& ci) const {
Square capsq = file_of(to) | rank_of(from); Square capsq = file_of(to) | rank_of(from);
Bitboard b = (pieces() ^ from ^ capsq) | to; Bitboard b = (pieces() ^ from ^ capsq) | to;
return (attacks_bb< ROOK>(ksq, b) & pieces(us, QUEEN, ROOK)) return (attacks_bb< ROOK>(ci.ksq, b) & pieces(sideToMove, QUEEN, ROOK))
| (attacks_bb<BISHOP>(ksq, b) & pieces(us, QUEEN, BISHOP)); | (attacks_bb<BISHOP>(ci.ksq, b) & pieces(sideToMove, QUEEN, BISHOP));
} }
case CASTLING: case CASTLING:
{ {
Square kfrom = from; Square kfrom = from;
Square rfrom = to; // Castling is encoded as 'King captures the rook' Square rfrom = to; // Castling is encoded as 'King captures the rook'
Square kto = relative_square(us, rfrom > kfrom ? SQ_G1 : SQ_C1); Square kto = relative_square(sideToMove, rfrom > kfrom ? SQ_G1 : SQ_C1);
Square rto = relative_square(us, rfrom > kfrom ? SQ_F1 : SQ_D1); Square rto = relative_square(sideToMove, rfrom > kfrom ? SQ_F1 : SQ_D1);
return (PseudoAttacks[ROOK][rto] & ksq) return (PseudoAttacks[ROOK][rto] & ci.ksq)
&& (attacks_bb<ROOK>(rto, (pieces() ^ kfrom ^ rfrom) | rto | kto) & ksq); && (attacks_bb<ROOK>(rto, (pieces() ^ kfrom ^ rfrom) | rto | kto) & ci.ksq);
} }
default: default:
assert(false); assert(false);