Rename NonSlidingAttacksBB[] in StepAttacksBB[]

[stockfish] / src / bitboard.cpp

diff --git a/src/bitboard.cpp b/src/bitboard.cpp
index bc8d5c3d93664f9b0a543d9e990817a86802728c..c4d34aeb1737b6513b527794a793da545dfe97fd 100644 (file)
--- a/src/bitboard.cpp
+++ b/src/bitboard.cpp
@@ -214,7 +214,7 @@ Bitboard BAttacks[0x1480];
 Bitboard SetMaskBB[65];
 Bitboard ClearMaskBB[65];
 
-Bitboard NonSlidingAttacksBB[16][64];
+Bitboard StepAttacksBB[16][64];
 Bitboard BetweenBB[64][64];
 
 Bitboard SquaresInFrontMask[2][64];
@@ -231,7 +231,7 @@ uint8_t BitCount8Bit[256];
 namespace {
 
   void init_masks();
-  void init_non_sliding_attacks();
+  void init_step_attacks();
   void init_pseudo_attacks();
   void init_between_bitboards();
   Bitboard index_to_bitboard(int index, Bitboard mask);
@@ -347,7 +347,7 @@ void init_bitboards() {
   int bishopDeltas[4][2] = {{1,1},{-1,1},{1,-1},{-1,-1}};
 
   init_masks();
-  init_non_sliding_attacks();
+  init_step_attacks();
   init_sliding_attacks(RAttacks, RAttackIndex, RMask, RShift, RMult, rookDeltas);
   init_sliding_attacks(BAttacks, BAttackIndex, BMask, BShift, BMult, bishopDeltas);
   init_pseudo_attacks();
@@ -384,7 +384,7 @@ namespace {
         BitCount8Bit[b] = (uint8_t)count_1s<CNT32>(b);
   }
 
-  void init_non_sliding_attacks() {
+  void init_step_attacks() {
 
     const int step[][9] =  {
       {0},
@@ -401,7 +401,7 @@ namespace {
                 Square to = s + Square(step[pc][k]);
 
                 if (square_is_ok(to) && square_distance(s, to) < 3)
-                    set_bit(&NonSlidingAttacksBB[pc][s], to);
+                    set_bit(&StepAttacksBB[pc][s], to);
            }
   }
 
@@ -482,8 +482,7 @@ namespace {
 
   void init_between_bitboards() {
 
-    Square s1, s2, s3;
-    SquareDelta d;
+    Square s1, s2, s3, d;
     int f, r;
 
     for (s1 = SQ_A1; s1 <= SQ_H8; s1++)
@@ -493,7 +492,7 @@ namespace {
                 f = file_distance(s1, s2);
                 r = rank_distance(s1, s2);
 
-                d = SquareDelta(s2 - s1) / Max(f, r);
+                d = (s2 - s1) / Max(f, r);
 
                 for (s3 = s1 + d; s3 != s2; s3 += d)
                     set_bit(&(BetweenBB[s1][s2]), s3);