Retire color.h

[stockfish] / src / piece.h

diff --git a/src/piece.h b/src/piece.h
index 12983a6bb92a996b7fc6df6ff4ba5da780170d78..341e877dab938863708cc6216676d0766e933fef 100644 (file)
--- a/src/piece.h
+++ b/src/piece.h
@@ -20,7 +20,6 @@
 #if !defined(PIECE_H_INCLUDED)
 #define PIECE_H_INCLUDED
 
 #if !defined(PIECE_H_INCLUDED)
 #define PIECE_H_INCLUDED
 

-#include "color.h"

 #include "value.h"
 
 enum PieceType {
 #include "value.h"
 
 enum PieceType {


@@ -33,8 +32,13 @@ enum Piece {
   BP = 9, BN = 10, BB = 11, BR = 12, BQ = 13, BK = 14, PIECE_NONE = 16
 };
 
   BP = 9, BN = 10, BB = 11, BR = 12, BQ = 13, BK = 14, PIECE_NONE = 16
 };
 

+enum Color {
+  WHITE, BLACK, COLOR_NONE
+};
+

 ENABLE_OPERATORS_ON(PieceType)
 ENABLE_OPERATORS_ON(Piece)
 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
 
 /// Important: If the material values are changed, one must also
 /// adjust the piece square tables, and the method game_phase() in the


@@ -65,6 +69,14 @@ inline Color color_of_piece(Piece p) {
   return Color(int(p) >> 3);
 }
 
   return Color(int(p) >> 3);
 }
 

+inline Color opposite_color(Color c) {
+  return Color(int(c) ^ 1);
+}
+
+inline bool color_is_ok(Color c) {
+  return c == WHITE || c == BLACK;
+}
+

 inline bool piece_type_is_ok(PieceType pt) {
   return pt >= PAWN && pt <= KING;
 }
 inline bool piece_type_is_ok(PieceType pt) {
   return pt >= PAWN && pt <= KING;
 }