X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fuci.cpp;h=9593b593c897fd1d626d452d62fdb8b8dc6b5df9;hp=cec9ccf10d8e40e0d560ad43e0a5030e3eb64310;hb=1d368bbbdc50bbb4e10933c4986abc07a08010fd;hpb=0c775fae4b758844f9446f125a3e6eed964ecaf0

diff --git a/src/uci.cpp b/src/uci.cpp
index cec9ccf1..9593b593 100644
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -77,8 +77,8 @@ bool execute_uci_command(const string& cmd) {
 
   else if (token == "uci")
       cout << "id name " << engine_name()
-           << "\nid author " << engine_author()
-           << "\n" << options_to_uci()
+           << "\nid author " << engine_authors()
+           << "\n" << Options.print_all()
            << "\nuciok" << endl;
 
   else if (token == "ucinewgame")
@@ -203,50 +203,48 @@ namespace {
   bool go(Position& pos, UCIParser& up) {
 
     string token;
-    Move searchMoves[MOVES_MAX];
-    int movesToGo, depth, nodes, moveTime, numOfMoves;
-    bool infinite, ponder;
-    int time[2] = {0, 0}, inc[2] = {0, 0};
-
-    searchMoves[0] = MOVE_NONE;
-    infinite = ponder = false;
-    movesToGo = depth = nodes = moveTime = numOfMoves = 0;
+    int time[] = { 0, 0 }, inc[] = { 0, 0 };
+    SearchLimits limits(0, 0, 0, 0, 0, 0, false, false);
+    Move searchMoves[MOVES_MAX] = { MOVE_NONE };
+    Move* cur = searchMoves;
 
     while (up >> token)
     {
         if (token == "infinite")
-            infinite = true;
+            limits.infinite = true;
         else if (token == "ponder")
-            ponder = true;
+            limits.ponder = true;
         else if (token == "wtime")
-            up >> time[0];
+            up >> time[WHITE];
         else if (token == "btime")
-            up >> time[1];
+            up >> time[BLACK];
         else if (token == "winc")
-            up >> inc[0];
+            up >> inc[WHITE];
         else if (token == "binc")
-            up >> inc[1];
+            up >> inc[BLACK];
         else if (token == "movestogo")
-            up >> movesToGo;
+            up >> limits.movesToGo;
         else if (token == "depth")
-            up >> depth;
+            up >> limits.maxDepth;
         else if (token == "nodes")
-            up >> nodes;
+            up >> limits.maxNodes;
         else if (token == "movetime")
-            up >> moveTime;
+            up >> limits.maxTime;
         else if (token == "searchmoves")
         {
             while (up >> token)
-                searchMoves[numOfMoves++] = move_from_uci(pos, token);
+                *cur++ = move_from_uci(pos, token);
 
-            searchMoves[numOfMoves] = MOVE_NONE;
+            *cur = MOVE_NONE;
         }
     }
 
     assert(pos.is_ok());
 
-    return think(pos, infinite, ponder, time, inc, movesToGo,
-                 depth, nodes, moveTime, searchMoves);
+    limits.time = time[pos.side_to_move()];
+    limits.increment = inc[pos.side_to_move()];
+
+    return think(pos, limits, searchMoves);
   }
 
   void perft(Position& pos, UCIParser& up) {