Change move_is_ok() and square_is_ok() in something useful

[stockfish] / src / uci.cpp

diff --git a/src/uci.cpp b/src/uci.cpp
index 5e85098504d30c3a4ecbc8d7cce412f265e28ac5..a7a61cecb4c61be92cb2a0600f0ecef4d2417b95 100644 (file)
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -49,10 +49,10 @@ namespace {
   typedef istringstream UCIParser;
 
   // Local functions
-  void set_option(UCIParser& uip);
-  void set_position(Position& pos, UCIParser& uip);
-  bool go(Position& pos, UCIParser& uip);
-  void perft(Position& pos, UCIParser& uip);
+  void set_option(UCIParser& up);
+  void set_position(Position& pos, UCIParser& up);
+  bool go(Position& pos, UCIParser& up);
+  void perft(Position& pos, UCIParser& up);
 }
 
 
@@ -63,7 +63,7 @@ namespace {
 
 bool execute_uci_command(const string& cmd) {
 
-  static Position pos(StartPositionFEN, 0); // The root position
+  static Position pos(StartPositionFEN, false, 0); // The root position
   UCIParser up(cmd);
   string token;
 
@@ -84,7 +84,7 @@ bool execute_uci_command(const string& cmd) {
       cout << "uciok" << endl;
   }
   else if (token == "ucinewgame")
-      pos.from_fen(StartPositionFEN);
+      pos.from_fen(StartPositionFEN, false);
 
   else if (token == "isready")
       cout << "readyok" << endl;
@@ -147,7 +147,7 @@ namespace {
 
     if (token == "startpos")
     {
-        pos.from_fen(StartPositionFEN);
+        pos.from_fen(StartPositionFEN, false);
         if (!(up >> token))
             return;
     }
@@ -159,7 +159,7 @@ namespace {
             fen += token;
             fen += ' ';
         }
-        pos.from_fen(fen);
+        pos.from_fen(fen, Options["UCI_Chess960"].value<bool>());
     }
 
     if (token != "moves")
@@ -287,7 +287,8 @@ namespace {
 
   void perft(Position& pos, UCIParser& up) {
 
-    int depth, tm, n;
+    int depth, tm;
+    int64_t n;
 
     if (!(up >> depth))
         return;