X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpiece.h;h=5605f4b6876671bd7f81f06614eb85e29d1e52dc;hp=be75a433867cd4e672e5a7013833f65ba8a03499;hb=f205fe1fe503fe2eae8167225393e0abdd635042;hpb=2c955f25de9d4c263b6e6d37fef06b378eec49a0 diff --git a/src/piece.h b/src/piece.h index be75a433..5605f4b6 100644 --- a/src/piece.h +++ b/src/piece.h @@ -1,7 +1,7 @@ /* Stockfish, a UCI chess playing engine derived from Glaurung 2.1 Copyright (C) 2004-2008 Tord Romstad (Glaurung author) - Copyright (C) 2008 Marco Costalba + Copyright (C) 2008-2009 Marco Costalba Stockfish is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -26,7 +26,6 @@ //// #include "color.h" -#include "misc.h" #include "square.h" @@ -50,41 +49,10 @@ enum Piece { //// Constants //// -const PieceType PieceTypeMin = PAWN; -const PieceType PieceTypeMax = KING; - 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 @@ -115,12 +83,8 @@ inline int piece_is_slider(Piece p) { return SlidingArray[int(p)]; } -inline int piece_type_is_slider(PieceType pt) { - return SlidingArray[int(pt)]; -} - inline SquareDelta pawn_push(Color c) { - return PawnPush[c]; + return (c == WHITE ? DELTA_N : DELTA_S); } inline bool piece_type_is_ok(PieceType pc) { @@ -136,7 +100,7 @@ inline bool piece_is_ok(Piece pc) { //// Prototypes //// -extern int piece_type_to_char(PieceType pt, bool upcase = false); +extern char piece_type_to_char(PieceType pt, bool upcase = false); extern PieceType piece_type_from_char(char c);