X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpiece.h;h=be75a433867cd4e672e5a7013833f65ba8a03499;hp=5b66949901dbbf185d8930a472ee7efa01815a4d;hb=8de91be61e0910936e3d6be6e1033a4fb8537dca;hpb=5dc23121215039938a9ef4e59ae934312774571c

diff --git a/src/piece.h b/src/piece.h
index 5b669499..be75a433 100644
--- a/src/piece.h
+++ b/src/piece.h
@@ -7,12 +7,12 @@
   it under the terms of the GNU General Public License as published by
   the Free Software Foundation, either version 3 of the License, or
   (at your option) any later version.
-  
+
   Stockfish is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
-  
+
   You should have received a copy of the GNU General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
@@ -21,7 +21,7 @@
 #if !defined(PIECE_H_INCLUDED)
 #define PIECE_H_INCLUDED
 
-//// 
+////
 //// Includes
 ////
 
@@ -30,7 +30,7 @@
 #include "square.h"
 
 
-//// 
+////
 //// Types
 ////
 
@@ -47,18 +47,46 @@ enum Piece {
 
 
 ////
-//// Constants and variables
+//// Constants
 ////
 
 const PieceType PieceTypeMin = PAWN;
 const PieceType PieceTypeMax = KING;
 
-extern const int SlidingArray[18];
-extern const SquareDelta Directions[16][16];   
-extern const SquareDelta PawnPush[2];
+const int SlidingArray[18] = {
+  0, 0, 0, 1, 2, 3, 0, 0, 0, 0, 0, 1, 2, 3, 0, 0, 0, 0
+};
+
+const SquareDelta Directions[16][16] = {
+  {DELTA_ZERO},
+  {DELTA_NW, DELTA_NE, DELTA_ZERO},
+  {DELTA_SSW, DELTA_SSE, DELTA_SWW, DELTA_SEE,
+   DELTA_NWW, DELTA_NEE, DELTA_NNW, DELTA_NNE, DELTA_ZERO},
+  {DELTA_SE, DELTA_SW, DELTA_NE, DELTA_NW, DELTA_ZERO},
+  {DELTA_S, DELTA_E, DELTA_W, DELTA_N, DELTA_ZERO},
+  {DELTA_S, DELTA_E, DELTA_W, DELTA_N,
+   DELTA_SE, DELTA_SW, DELTA_NE, DELTA_NW, DELTA_ZERO},
+  {DELTA_S, DELTA_E, DELTA_W, DELTA_N,
+   DELTA_SE, DELTA_SW, DELTA_NE, DELTA_NW, DELTA_ZERO},
+  {DELTA_ZERO},
+  {DELTA_ZERO},
+  {DELTA_SW, DELTA_SE, DELTA_ZERO},
+  {DELTA_SSW, DELTA_SSE, DELTA_SWW, DELTA_SEE,
+   DELTA_NWW, DELTA_NEE, DELTA_NNW, DELTA_NNE, DELTA_ZERO},
+  {DELTA_SE, DELTA_SW, DELTA_NE, DELTA_NW, DELTA_ZERO},
+  {DELTA_S, DELTA_E, DELTA_W, DELTA_N, DELTA_ZERO},
+  {DELTA_S, DELTA_E, DELTA_W, DELTA_N,
+   DELTA_SE, DELTA_SW, DELTA_NE, DELTA_NW, DELTA_ZERO},
+  {DELTA_S, DELTA_E, DELTA_W, DELTA_N,
+   DELTA_SE, DELTA_SW, DELTA_NE, DELTA_NW, DELTA_ZERO},
+};
+
+const SquareDelta PawnPush[2] = {
+  DELTA_N, DELTA_S
+};
 
 
-//// 
+////
 //// Inline functions
 ////
 
@@ -83,30 +111,6 @@ inline Piece piece_of_color_and_type(Color c, PieceType pt) {
   return Piece((int(c) << 3) | int(pt));
 }
 
-inline Piece pawn_of_color(Color c) {
-  return piece_of_color_and_type(c, PAWN);
-}
-
-inline Piece knight_of_color(Color c) {
-  return piece_of_color_and_type(c, KNIGHT);
-}
-
-inline Piece bishop_of_color(Color c) {
-  return piece_of_color_and_type(c, BISHOP);
-}
-
-inline Piece rook_of_color(Color c) {
-  return piece_of_color_and_type(c, ROOK);
-}
-
-inline Piece queen_of_color(Color c) {
-  return piece_of_color_and_type(c, QUEEN);
-}
-
-inline Piece king_of_color(Color c) {
-  return piece_of_color_and_type(c, KING);
-}
-
 inline int piece_is_slider(Piece p) {
   return SlidingArray[int(p)];
 }
@@ -118,16 +122,22 @@ inline int piece_type_is_slider(PieceType pt) {
 inline SquareDelta pawn_push(Color c) {
   return PawnPush[c];
 }
-  
+
+inline bool piece_type_is_ok(PieceType pc) {
+  return pc >= PAWN && pc <= KING;
+}
+
+inline bool piece_is_ok(Piece pc) {
+  return piece_type_is_ok(type_of_piece(pc)) && color_is_ok(color_of_piece(pc));
+}
+
 
 ////
 //// Prototypes
 ////
 
-extern char piece_type_to_char(PieceType pt, bool upcase);
+extern int piece_type_to_char(PieceType pt, bool upcase = false);
 extern PieceType piece_type_from_char(char c);
-extern bool piece_is_ok(Piece pc);
-extern bool piece_type_is_ok(PieceType pt);
 
 
 #endif // !defined(PIECE_H_INCLUDED)