#include "bitcount.h"
#include "rkiss.h"
-Bitboard RMasks[SQUARE_NB];
-Bitboard RMagics[SQUARE_NB];
-Bitboard* RAttacks[SQUARE_NB];
-unsigned RShifts[SQUARE_NB];
+Bitboard RookMasks[SQUARE_NB];
+Bitboard RookMagics[SQUARE_NB];
+Bitboard* RookAttacks[SQUARE_NB];
+unsigned RookShifts[SQUARE_NB];
-Bitboard BMasks[SQUARE_NB];
-Bitboard BMagics[SQUARE_NB];
-Bitboard* BAttacks[SQUARE_NB];
-unsigned BShifts[SQUARE_NB];
+Bitboard BishopMasks[SQUARE_NB];
+Bitboard BishopMagics[SQUARE_NB];
+Bitboard* BishopAttacks[SQUARE_NB];
+unsigned BishopShifts[SQUARE_NB];
Bitboard SquareBB[SQUARE_NB];
Bitboard FileBB[FILE_NB];
int MS1BTable[256];
Square BSFTable[SQUARE_NB];
- Bitboard RTable[0x19000]; // Storage space for rook attacks
- Bitboard BTable[0x1480]; // Storage space for bishop attacks
+ Bitboard RookTable[0x19000]; // Storage space for rook attacks
+ Bitboard BishopTable[0x1480]; // Storage space for bishop attacks
typedef unsigned (Fn)(Square, Bitboard);
for (Square s2 = SQ_A1; s2 <= SQ_H8; ++s2)
if (s1 != s2)
{
- SquareDistance[s1][s2] = std::max(file_distance(s1, s2), rank_distance(s1, s2));
+ SquareDistance[s1][s2] = std::max(distance<File>(s1, s2), distance<Rank>(s1, s2));
DistanceRingsBB[s1][SquareDistance[s1][s2] - 1] |= s2;
}
{
Square to = s + Square(c == WHITE ? steps[pt][i] : -steps[pt][i]);
- if (is_ok(to) && square_distance(s, to) < 3)
+ if (is_ok(to) && distance(s, to) < 3)
StepAttacksBB[make_piece(c, pt)][s] |= to;
}
- Square RDeltas[] = { DELTA_N, DELTA_E, DELTA_S, DELTA_W };
- Square BDeltas[] = { DELTA_NE, DELTA_SE, DELTA_SW, DELTA_NW };
+ Square RookDeltas[] = { DELTA_N, DELTA_E, DELTA_S, DELTA_W };
+ Square BishopDeltas[] = { DELTA_NE, DELTA_SE, DELTA_SW, DELTA_NW };
- init_magics(RTable, RAttacks, RMagics, RMasks, RShifts, RDeltas, magic_index<ROOK>);
- init_magics(BTable, BAttacks, BMagics, BMasks, BShifts, BDeltas, magic_index<BISHOP>);
+ init_magics(RookTable, RookAttacks, RookMagics, RookMasks, RookShifts, RookDeltas, magic_index<ROOK>);
+ init_magics(BishopTable, BishopAttacks, BishopMagics, BishopMasks, BishopShifts, BishopDeltas, magic_index<BISHOP>);
for (Square s1 = SQ_A1; s1 <= SQ_H8; ++s1)
{
for (int i = 0; i < 4; ++i)
for (Square s = sq + deltas[i];
- is_ok(s) && square_distance(s, s - deltas[i]) == 1;
+ is_ok(s) && distance(s, s - deltas[i]) == 1;
s += deltas[i])
{
attack |= s;