X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fpiece.h;h=341e877dab938863708cc6216676d0766e933fef;hb=95212222c7444538b84326208e433ac12f15e9fb;hp=59fb83924d1f79dfc7fbffb8a95401ef77bae915;hpb=00d9fe8af09891e82d66f88c48b513d6a7326f2a;p=stockfish
diff --git a/src/piece.h b/src/piece.h
index 59fb8392..341e877d 100644
--- a/src/piece.h
+++ b/src/piece.h
@@ -17,25 +17,11 @@
along with this program. If not, see .
*/
-
#if !defined(PIECE_H_INCLUDED)
#define PIECE_H_INCLUDED
-////
-//// Includes
-////
-
-#include
-
-#include "color.h"
-#include "square.h"
#include "value.h"
-
-////
-//// Types
-////
-
enum PieceType {
PIECE_TYPE_NONE = 0,
PAWN = 1, KNIGHT = 2, BISHOP = 3, ROOK = 4, QUEEN = 5, KING = 6
@@ -46,13 +32,13 @@ enum Piece {
BP = 9, BN = 10, BB = 11, BR = 12, BQ = 13, BK = 14, PIECE_NONE = 16
};
-ENABLE_OPERATORS_ON(PieceType);
-ENABLE_OPERATORS_ON(Piece);
-
+enum Color {
+ WHITE, BLACK, COLOR_NONE
+};
-////
-//// Constants
-////
+ENABLE_OPERATORS_ON(PieceType)
+ENABLE_OPERATORS_ON(Piece)
+ENABLE_OPERATORS_ON(Color)
/// Important: If the material values are changed, one must also
/// adjust the piece square tables, and the method game_phase() in the
@@ -71,10 +57,9 @@ const Value RookValueEndgame = Value(0x4FE);
const Value QueenValueMidgame = Value(0x9D9);
const Value QueenValueEndgame = Value(0x9FE);
-
-////
-//// Inline functions
-////
+inline Piece make_piece(Color c, PieceType pt) {
+ return Piece((int(c) << 3) | int(pt));
+}
inline PieceType type_of_piece(Piece p) {
return PieceType(int(p) & 7);
@@ -84,28 +69,25 @@ inline Color color_of_piece(Piece p) {
return Color(int(p) >> 3);
}
-inline Piece piece_of_color_and_type(Color c, PieceType pt) {
- return Piece((int(c) << 3) | int(pt));
+inline Color opposite_color(Color c) {
+ return Color(int(c) ^ 1);
}
-inline SquareDelta pawn_push(Color c) {
- return (c == WHITE ? DELTA_N : DELTA_S);
+inline bool color_is_ok(Color c) {
+ return c == WHITE || c == BLACK;
}
-inline bool piece_type_is_ok(PieceType pc) {
- return pc >= PAWN && pc <= KING;
+inline bool piece_type_is_ok(PieceType pt) {
+ return pt >= PAWN && pt <= KING;
}
-inline bool piece_is_ok(Piece pc) {
- return piece_type_is_ok(type_of_piece(pc)) && color_is_ok(color_of_piece(pc));
+inline bool piece_is_ok(Piece p) {
+ return piece_type_is_ok(type_of_piece(p)) && color_is_ok(color_of_piece(p));
}
inline char piece_type_to_char(PieceType pt) {
- return std::string(" PNBRQK")[pt];
-}
-
-inline PieceType piece_type_from_char(char c) {
- return PieceType(std::string(" PNBRQK").find(c));
+ static const char ch[] = " PNBRQK";
+ return ch[pt];
}
#endif // !defined(PIECE_H_INCLUDED)