Rename piece_of_color_and_type() to make_piece()

[stockfish] / src / color.h

diff --git a/src/color.h b/src/color.h
index 929102d698018f736fdc0c58185bb244db7be363..08eb8d8183c6edbdb9fc572003a5af1e49f42f6a 100644 (file)
--- a/src/color.h
+++ b/src/color.h
@@ -1,18 +1,18 @@
 /*
   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-2010 Marco Costalba, Joona Kiiski, Tord Romstad
 
   Stockfish is free software: you can redistribute it and/or modify
   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,41 +21,36 @@
 #if !defined(COLOR_H_INCLUDED)
 #define COLOR_H_INCLUDED
 
-////
-//// Includes
-////
-
-#include "misc.h"
-
+#include "types.h"
 
 ////
 //// Types
 ////
 
 enum Color {
-  WHITE, 
-  BLACK, 
+  WHITE,
+  BLACK,
   COLOR_NONE
 };
 
+enum SquareColor {
+  DARK,
+  LIGHT
+};
+
+ENABLE_OPERATORS_ON(Color)
+
 
 ////
 //// Inline functions
 ////
 
-inline Color operator+ (Color c, int i) { return Color(int(c) + i); }
-inline void operator++ (Color &c, int i) { c = Color(int(c) + 1); }
-
 inline Color opposite_color(Color c) {
   return Color(int(c) ^ 1);
 }
 
-
-////
-//// Prototypes
-////
-
-extern bool color_is_ok(Color c);
-
+inline bool color_is_ok(Color c) {
+  return c == WHITE || c == BLACK;
+}
 
 #endif // !defined(COLOR_H_INCLUDED)