Space inflate generate_castle_moves()

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba
2008-10-18 11:07:27 +02:00
parent 146bb2dfa7
commit 35fd5ce5bc

View File

@@ -970,14 +970,18 @@ namespace {
int generate_castle_moves(const Position &pos, MoveStack *mlist, Color us) { int generate_castle_moves(const Position &pos, MoveStack *mlist, Color us) {
int n = 0; int n = 0;
if(pos.can_castle(us)) { if (pos.can_castle(us))
{
Color them = opposite_color(us); Color them = opposite_color(us);
Square ksq = pos.king_square(us); Square ksq = pos.king_square(us);
assert(pos.piece_on(ksq) == king_of_color(us)); assert(pos.piece_on(ksq) == king_of_color(us));
if(pos.can_castle_kingside(us)) { if (pos.can_castle_kingside(us))
{
Square rsq = pos.initial_kr_square(us); Square rsq = pos.initial_kr_square(us);
Square g1 = relative_square(us, SQ_G1); Square g1 = relative_square(us, SQ_G1);
Square f1 = relative_square(us, SQ_F1); Square f1 = relative_square(us, SQ_F1);
@@ -990,6 +994,7 @@ namespace {
if ( (s != ksq && s != rsq && pos.square_is_occupied(s)) if ( (s != ksq && s != rsq && pos.square_is_occupied(s))
|| pos.square_is_attacked(s, them)) || pos.square_is_attacked(s, them))
illegal = true; illegal = true;
for (s = Min(rsq, f1); s <= Max(rsq, f1); s++) for (s = Min(rsq, f1); s <= Max(rsq, f1); s++)
if (s != ksq && s != rsq && pos.square_is_occupied(s)) if (s != ksq && s != rsq && pos.square_is_occupied(s))
illegal = true; illegal = true;
@@ -998,7 +1003,8 @@ namespace {
mlist[n++].move = make_castle_move(ksq, rsq); mlist[n++].move = make_castle_move(ksq, rsq);
} }
if(pos.can_castle_queenside(us)) { if (pos.can_castle_queenside(us))
{
Square rsq = pos.initial_qr_square(us); Square rsq = pos.initial_qr_square(us);
Square c1 = relative_square(us, SQ_C1); Square c1 = relative_square(us, SQ_C1);
Square d1 = relative_square(us, SQ_D1); Square d1 = relative_square(us, SQ_D1);
@@ -1011,19 +1017,20 @@ namespace {
if ( (s != ksq && s != rsq && pos.square_is_occupied(s)) if ( (s != ksq && s != rsq && pos.square_is_occupied(s))
|| pos.square_is_attacked(s, them)) || pos.square_is_attacked(s, them))
illegal = true; illegal = true;
for (s = Min(rsq, d1); s <= Max(rsq, d1); s++) for (s = Min(rsq, d1); s <= Max(rsq, d1); s++)
if (s != ksq && s != rsq && pos.square_is_occupied(s)) if (s != ksq && s != rsq && pos.square_is_occupied(s))
illegal = true; illegal = true;
if(square_file(rsq) == FILE_B &&
(pos.piece_on(relative_square(us, SQ_A1)) == rook_of_color(them) || if ( square_file(rsq) == FILE_B
pos.piece_on(relative_square(us, SQ_A1)) == queen_of_color(them))) && ( pos.piece_on(relative_square(us, SQ_A1)) == rook_of_color(them)
|| pos.piece_on(relative_square(us, SQ_A1)) == queen_of_color(them)))
illegal = true; illegal = true;
if (!illegal) if (!illegal)
mlist[n++].move = make_castle_move(ksq, rsq); mlist[n++].move = make_castle_move(ksq, rsq);
} }
} }
return n; return n;
} }