X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fmovegen.cpp;h=612a87e577faec13cf342d1522a4b9abea107146;hb=2608b9249d9c25a699c8db8725e35bd4ec0b65ab;hp=e2cc7b99d513265f9199be3a0d7ad8fab5a85533;hpb=a492a9dd079d95faf136a744ff6d47a3d109ad68;p=stockfish diff --git a/src/movegen.cpp b/src/movegen.cpp index e2cc7b99..612a87e5 100644 --- a/src/movegen.cpp +++ b/src/movegen.cpp @@ -155,7 +155,7 @@ namespace { // Single and double pawn pushes, no promotions if (Type != MV_CAPTURE) { - emptySquares = (Type == MV_QUIET ? target : pos.empty_squares()); + emptySquares = (Type == MV_QUIET ? target : ~pos.occupied_squares()); b1 = move_pawns(pawnsNotOn7) & emptySquares; b2 = move_pawns(b1 & TRank3BB) & emptySquares; @@ -193,7 +193,7 @@ namespace { if (pawnsOn7 && (Type != MV_EVASION || (target & TRank8BB))) { if (Type == MV_CAPTURE) - emptySquares = pos.empty_squares(); + emptySquares = ~pos.occupied_squares(); if (Type == MV_EVASION) emptySquares &= target; @@ -246,7 +246,7 @@ namespace { if (*pl != SQ_NONE) { - target = ci.checkSq[Pt] & pos.empty_squares(); // Non capture checks only + target = ci.checkSq[Pt] & ~pos.occupied_squares(); // Non capture checks only do { from = *pl; @@ -321,10 +321,10 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) { target = pos.pieces(~us); else if (Type == MV_QUIET) - target = pos.empty_squares(); + target = ~pos.occupied_squares(); else if (Type == MV_NON_EVASION) - target = pos.pieces(~us) | pos.empty_squares(); + target = pos.pieces(~us) | ~pos.occupied_squares(); mlist = (us == WHITE ? generate_pawn_moves(pos, mlist, target) : generate_pawn_moves(pos, mlist, target)); @@ -369,7 +369,7 @@ MoveStack* generate(const Position& pos, MoveStack* mlist) { if (pt == PAWN) continue; // Will be generated togheter with direct checks - Bitboard b = pos.attacks_from(Piece(pt), from) & pos.empty_squares(); + Bitboard b = pos.attacks_from(Piece(pt), from) & ~pos.occupied_squares(); if (pt == KING) b &= ~PseudoAttacks[QUEEN][ci.ksq];