X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fpiece.h;h=cf23c0288c2e79dc25bf6cdc6da720f858011532;hp=59f22425372d4cf6de204f74a3d668322156b680;hb=a9e55d43262d11a916bdfa68cd1de0174d884cd3;hpb=9d1e4d041d97d2a11a430a3bb6fa360fca31e69f

diff --git a/src/piece.h b/src/piece.h
index 59f22425..cf23c028 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,16 +21,15 @@
 #if !defined(PIECE_H_INCLUDED)
 #define PIECE_H_INCLUDED
 
-//// 
+////
 //// Includes
 ////
 
 #include "color.h"
-#include "misc.h"
 #include "square.h"
 
 
-//// 
+////
 //// Types
 ////
 
@@ -47,18 +46,15 @@ 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
+};
 
 
-//// 
+////
 //// Inline functions
 ////
 
@@ -83,51 +79,33 @@ 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 int piece_is_slider(Piece p) {
+  return SlidingArray[int(p)];
 }
 
-inline Piece rook_of_color(Color c) {
-  return piece_of_color_and_type(c, ROOK);
+inline int piece_is_slider(PieceType pt) {
+  return SlidingArray[int(pt)];
 }
 
-inline Piece queen_of_color(Color c) {
-  return piece_of_color_and_type(c, QUEEN);
+inline SquareDelta pawn_push(Color c) {
+    return (c == WHITE ? DELTA_N : DELTA_S);
 }
 
-inline Piece king_of_color(Color c) {
-  return piece_of_color_and_type(c, KING);
+inline bool piece_type_is_ok(PieceType pc) {
+  return pc >= PAWN && pc <= KING;
 }
 
-inline int piece_is_slider(Piece p) {
-  return SlidingArray[int(p)];
+inline bool piece_is_ok(Piece pc) {
+  return piece_type_is_ok(type_of_piece(pc)) && color_is_ok(color_of_piece(pc));
 }
 
-inline int piece_type_is_slider(PieceType pt) {
-  return SlidingArray[int(pt)];
-}
-
-inline SquareDelta pawn_push(Color c) {
-  return PawnPush[c];
-}
-  
 
 ////
 //// Prototypes
 ////
 
-extern char piece_type_to_char(PieceType pt, bool upcase = false);
+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)