Move RootColor from Eval to Search

[stockfish] / src / search.cpp

diff --git a/src/search.cpp b/src/search.cpp
index 09d272e56983361fe813032c0051adf011169aac..3f5be1a38efe7fb8f823fcf2bda610aa211f64b7 100644 (file)
--- a/src/search.cpp
+++ b/src/search.cpp
@@ -42,6 +42,7 @@ namespace Search {
   LimitsType Limits;
   std::vector<RootMove> RootMoves;
   Position RootPosition;
   LimitsType Limits;
   std::vector<RootMove> RootMoves;
   Position RootPosition;

+  Color RootColor;

   Time::point SearchTime;
   StateStackPtr SetupStates;
 }
   Time::point SearchTime;
   StateStackPtr SetupStates;
 }


@@ -174,7 +175,7 @@ void Search::think() {
 
   Position& pos = RootPosition;
   Chess960 = pos.is_chess960();
 
   Position& pos = RootPosition;
   Chess960 = pos.is_chess960();

-  Eval::RootColor = pos.side_to_move();
+  RootColor = pos.side_to_move();

   TimeMgr.init(Limits, pos.startpos_ply_counter(), pos.side_to_move());
   TT.new_search();
   H.clear();
   TimeMgr.init(Limits, pos.startpos_ply_counter(), pos.side_to_move());
   TT.new_search();
   H.clear();


@@ -192,8 +193,8 @@ void Search::think() {
   {
       int cf = Options["Contempt Factor"] * PawnValueMg / 100;  // In centipawns
       cf = cf * MaterialTable::game_phase(pos) / PHASE_MIDGAME; // Scale down with phase
   {
       int cf = Options["Contempt Factor"] * PawnValueMg / 100;  // In centipawns
       cf = cf * MaterialTable::game_phase(pos) / PHASE_MIDGAME; // Scale down with phase

-      DrawValue[ Eval::RootColor] = VALUE_DRAW - Value(cf);
-      DrawValue[~Eval::RootColor] = VALUE_DRAW + Value(cf);
+      DrawValue[ RootColor] = VALUE_DRAW - Value(cf);
+      DrawValue[~RootColor] = VALUE_DRAW + Value(cf);

   }
   else
       DrawValue[WHITE] = DrawValue[BLACK] = VALUE_DRAW;
   }
   else
       DrawValue[WHITE] = DrawValue[BLACK] = VALUE_DRAW;