Fix broken chess960 under Shredder GUI

[stockfish] / src / uci.cpp

diff --git a/src/uci.cpp b/src/uci.cpp
index 60d10b0b70368c5e05250e3fe7f63593048ee2e6..5ba31e7050598e44b24192be76640633daf94f5b 100644 (file)
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -46,6 +46,9 @@ using namespace std;
 
 namespace {
 
+  // FEN string for the initial position
+  const string StartPositionFEN = "rnbqkbnr/pppppppp/8/8/8/8/PPPPPPPP/RNBQKBNR w KQkq - 0 1";
+
   // UCIInputParser is a class for parsing UCI input. The class
   // is actually a string stream built on a given input string.
 
@@ -126,7 +129,6 @@ namespace {
     else if (token == "ucinewgame")
     {
         push_button("New Game");
-        Position::init_piece_square_tables();
         RootPosition.from_fen(StartPositionFEN);
     }
     else if (token == "isready")
@@ -148,10 +150,10 @@ namespace {
     }
     else if (token == "eval")
     {
-        EvalInfo ei;
+        Value evalMargin;
         cout << "Incremental mg: "   << mg_value(RootPosition.value())
              << "\nIncremental eg: " << eg_value(RootPosition.value())
-             << "\nFull eval: "      << evaluate(RootPosition, ei) << endl;
+             << "\nFull eval: "      << evaluate(RootPosition, evalMargin) << endl;
     }
     else if (token == "key")
         cout << "key: " << hex << RootPosition.get_key()
@@ -207,6 +209,8 @@ namespace {
                 RootPosition.do_move(move, st);
                 if (RootPosition.rule_50_counter() == 0)
                     RootPosition.reset_game_ply();
+
+                RootPosition.inc_startpos_ply_counter(); //FIXME: make from_fen to support this and rule50
             }
             // Our StateInfo st is about going out of scope so copy
             // its content inside RootPosition before it disappears.
@@ -315,7 +319,7 @@ namespace {
 
     tm = get_system_time();
 
-    n = perft(pos, depth * OnePly);
+    n = perft(pos, depth * ONE_PLY);
 
     tm = get_system_time() - tm;
     std::cout << "\nNodes " << n