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

Reformat do_castling()

Browse source 
No functional change.
This commit is contained in:
Marco Costalba 2014-03-13 12:53:03 +01:00
parent 6f3d787692
commit 6571acffaa
2 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/position.cpp
View file

@ -739,14 +739,10 @@ void Position::do_move(Move m, StateInfo& newSt, const CheckInfo& ci, bool moveI
{ {
assert(pc == make_piece(us, KING)); assert(pc == make_piece(us, KING));
bool kingSide = to > from; Square rfrom, rto;
Square rfrom = to; // Castling is encoded as "king captures friendly rook" do_castling<true>(from, to, rfrom, rto);
Square rto = relative_square(us, kingSide ? SQ_F1 : SQ_D1);
to = relative_square(us, kingSide ? SQ_G1 : SQ_C1);
captured = NO_PIECE_TYPE; captured = NO_PIECE_TYPE;
do_castling(from, to, rfrom, rto);
st->psq += psq[us][ROOK][rto] - psq[us][ROOK][rfrom]; st->psq += psq[us][ROOK][rto] - psq[us][ROOK][rfrom];
k ^= Zobrist::psq[us][ROOK][rfrom] ^ Zobrist::psq[us][ROOK][rto]; k ^= Zobrist::psq[us][ROOK][rfrom] ^ Zobrist::psq[us][ROOK][rto];
} }
@ -933,13 +929,11 @@ void Position::undo_move(Move m) {
if (type_of(m) == CASTLING) if (type_of(m) == CASTLING)
{ {
bool kingSide = to > from; Square rfrom, rto;
Square rfrom = to; // Castling is encoded as "king captures friendly rook" do_castling<false>(from, to, rfrom, rto);
Square rto = relative_square(us, kingSide ? SQ_F1 : SQ_D1);
to = relative_square(us, kingSide ? SQ_G1 : SQ_C1);
captured = NO_PIECE_TYPE; captured = NO_PIECE_TYPE;
pt = KING; pt = KING;
do_castling(to, from, rto, rfrom);
} }
else else
move_piece(to, from, us, pt); // Put the piece back at the source square move_piece(to, from, us, pt); // Put the piece back at the source square
@ -971,15 +965,20 @@ void Position::undo_move(Move m) {
/// Position::do_castling() is a helper used to do/undo a castling move. This /// Position::do_castling() is a helper used to do/undo a castling move. This
/// is a bit tricky, especially in Chess960. /// is a bit tricky, especially in Chess960.
template<bool Do>
void Position::do_castling(Square from, Square& to, Square& rfrom, Square& rto) {
void Position::do_castling(Square kfrom, Square kto, Square rfrom, Square rto) { bool kingSide = to > from;
rfrom = to; // Castling is encoded as "king captures friendly rook"
rto = relative_square(sideToMove, kingSide ? SQ_F1 : SQ_D1);
to = relative_square(sideToMove, kingSide ? SQ_G1 : SQ_C1);
// Remove both pieces first since squares could overlap in Chess960 // Remove both pieces first since squares could overlap in Chess960
remove_piece(kfrom, sideToMove, KING); remove_piece(Do ? from : to, sideToMove, KING);
remove_piece(rfrom, sideToMove, ROOK); remove_piece(Do ? rfrom : rto, sideToMove, ROOK);
board[kfrom] = board[rfrom] = NO_PIECE; // Since remove_piece doesn't do it for us board[Do ? from : to] = board[Do ? rfrom : rto] = NO_PIECE; // Since remove_piece doesn't do it for us
put_piece(kto, sideToMove, KING); put_piece(Do ? to : from, sideToMove, KING);
put_piece(rto, sideToMove, ROOK); put_piece(Do ? rto : rfrom, sideToMove, ROOK);
} }

3
src/position.h
View file

@ -174,11 +174,12 @@ private:
void set_state(StateInfo* si) const; void set_state(StateInfo* si) const;
// Helper functions // Helper functions
void do_castling(Square kfrom, Square kto, Square rfrom, Square rto);
Bitboard check_blockers(Color c, Color kingColor) const; Bitboard check_blockers(Color c, Color kingColor) const;
void put_piece(Square s, Color c, PieceType pt); void put_piece(Square s, Color c, PieceType pt);
void remove_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); void move_piece(Square from, Square to, Color c, PieceType pt);
template<bool Do>
void do_castling(Square from, Square& to, Square& rfrom, Square& rto);
// Board and pieces // Board and pieces
Piece board[SQUARE_NB]; Piece board[SQUARE_NB];