X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fposition.h;h=6307f126a4a613652c1f76ebef662f01babad9f7;hb=fc519ca74a110a0ceea3c710c88da096fa850c65;hp=6c48b54c341676f98a58243a7f42869e2a69e74b;hpb=3b2bcee0a865e18fcc38a4d0aa648053960432a8;p=stockfish

diff --git a/src/position.h b/src/position.h
index 6c48b54c..6307f126 100644
--- a/src/position.h
+++ b/src/position.h
@@ -247,9 +247,8 @@ public:
   // Position consistency check, for debugging
   bool is_ok(int* failedStep = NULL) const;
 
-  // Static member functions
-  static void init_zobrist();
-  static void init_piece_square_tables();
+  // Global initialization
+  static void init();
 
 private:
 
@@ -257,8 +256,8 @@ private:
   void clear();
   void detach();
   void put_piece(Piece p, Square s);
-  void do_allow_oo(Color c);
-  void do_allow_ooo(Color c);
+  void set_castle_kingside(Color c);
+  void set_castle_queenside(Color c);
   bool set_castling_rights(char token);
   bool move_is_pl_slow(const Move m) const;
 
@@ -406,16 +405,24 @@ inline Square Position::king_square(Color c) const {
   return pieceList[c][KING][0];
 }
 
-inline bool Position::can_castle_kingside(Color side) const {
-  return st->castleRights & (1+int(side));
+inline bool Position::can_castle_kingside(Color c) const {
+  return st->castleRights & (WHITE_OO << c);
 }
 
-inline bool Position::can_castle_queenside(Color side) const {
-  return st->castleRights & (4+4*int(side));
+inline bool Position::can_castle_queenside(Color c) const {
+  return st->castleRights & (WHITE_OOO << c);
 }
 
-inline bool Position::can_castle(Color side) const {
-  return can_castle_kingside(side) || can_castle_queenside(side);
+inline bool Position::can_castle(Color c) const {
+  return st->castleRights & ((WHITE_OO | WHITE_OOO) << c);
+}
+
+inline void Position::set_castle_kingside(Color c) {
+  st->castleRights |= (WHITE_OO << c);
+}
+
+inline void Position::set_castle_queenside(Color c) {
+  st->castleRights |= (WHITE_OOO << c);
 }
 
 inline Square Position::initial_kr_square(Color c) const {
@@ -542,12 +549,4 @@ inline int Position::thread() const {
   return threadID;
 }
 
-inline void Position::do_allow_oo(Color c) {
-  st->castleRights |= (1 + int(c));
-}
-
-inline void Position::do_allow_ooo(Color c) {
-  st->castleRights |= (4 + 4*int(c));
-}
-
 #endif // !defined(POSITION_H_INCLUDED)