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

Simplify squares_delta()

Browse source 
And rename in ray_direction()

Patch from UncombedCoconut.

No functional change.

Signed-off-by: Marco Costalba <mcostalba@gmail.com>
This commit is contained in:
Marco Costalba 2011-01-02 10:41:05 +01:00
parent f902ddaa89
commit 57c51dd1ef
2 changed files with 8 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/bitboard.cpp
View file

@ -248,7 +248,7 @@ namespace {
void init_attacks(); void init_attacks();
void init_between_bitboards(); void init_between_bitboards();
void init_pseudo_attacks(); void init_pseudo_attacks();
SquareDelta squares_delta(Square orig, Square dest); SquareDelta ray_direction(Square orig, Square dest);
Bitboard index_to_bitboard(int index, Bitboard mask); Bitboard index_to_bitboard(int index, Bitboard mask);
Bitboard sliding_attacks(int sq, Bitboard block, int dirs, int deltas[][2], Bitboard sliding_attacks(int sq, Bitboard block, int dirs, int deltas[][2],
int fmin, int fmax, int rmin, int rmax); int fmin, int fmax, int rmin, int rmax);
@ -454,23 +454,14 @@ namespace {
return result; return result;
} }
SquareDelta squares_delta(Square orig, Square dest) { SquareDelta ray_direction(Square orig, Square dest) {
const SquareDelta deltas[] = { DELTA_N, DELTA_NE, DELTA_E, DELTA_SE, int df = file_distance(orig, dest);
DELTA_S, DELTA_SW, DELTA_W, DELTA_NW }; int dr = rank_distance(orig, dest);
for (int idx = 0; idx < 8; idx++) if (orig != dest && (!df || !dr || df == dr))
{ return SquareDelta(dest - orig) / Max(df, dr);
Square s = orig + deltas[idx];
while (square_is_ok(s) && square_distance(s, s - deltas[idx]) == 1)
{
if (s == dest)
return deltas[idx];
s += deltas[idx];
}
}
return DELTA_NONE; return DELTA_NONE;
} }
@ -483,7 +474,7 @@ namespace {
for (s2 = SQ_A1; s2 <= SQ_H8; s2++) for (s2 = SQ_A1; s2 <= SQ_H8; s2++)
{ {
BetweenBB[s1][s2] = EmptyBoardBB; BetweenBB[s1][s2] = EmptyBoardBB;
d = squares_delta(s1, s2); d = ray_direction(s1, s2);
if (d != DELTA_NONE) if (d != DELTA_NONE)
for (s3 = s1 + d; s3 != s2; s3 += d) for (s3 = s1 + d; s3 != s2; s3 += d)

2
src/movegen.cpp
View file

@ -562,7 +562,7 @@ namespace {
if (Type == CHECK) if (Type == CHECK)
{ {
// Condider only pawn moves which give direct checks // Consider only pawn moves which give direct checks
b1 &= pos.attacks_from<PAWN>(ksq, Them); b1 &= pos.attacks_from<PAWN>(ksq, Them);
b2 &= pos.attacks_from<PAWN>(ksq, Them); b2 &= pos.attacks_from<PAWN>(ksq, Them);