X-Git-Url: https://git.sesse.net/?p=stockfish;a=blobdiff_plain;f=src%2Fuci.cpp;h=c4d01fa10dbda9b6af3f531acd04af52c2865438;hp=fb2d3eac5834e7e9d8dc28b88dc7022cef7e96fa;hb=87b483f99922c493d20b40d9dd16beeb9ee443c1;hpb=348f8241041a26cd9458beb8098306099f44a46a

diff --git a/src/uci.cpp b/src/uci.cpp
index fb2d3eac..c4d01fa1 100644
--- a/src/uci.cpp
+++ b/src/uci.cpp
@@ -24,7 +24,6 @@
 
 #include "evaluate.h"
 #include "misc.h"
-#include "move.h"
 #include "position.h"
 #include "search.h"
 #include "thread.h"
@@ -118,14 +117,14 @@ void uci_loop() {
       }
 
       else if (token == "key")
-          cout << "key: " << hex     << pos.get_key()
-               << "\nmaterial key: " << pos.get_material_key()
-               << "\npawn key: "     << pos.get_pawn_key() << endl;
+          cout << "key: " << hex     << pos.key()
+               << "\nmaterial key: " << pos.material_key()
+               << "\npawn key: "     << pos.pawn_key() << endl;
 
       else if (token == "uci")
           cout << "id name "     << engine_name()
                << "\nid author " << engine_authors()
-               << "\n"           << Options.print_all()
+               << "\n"           << Options
                << "\nuciok"      << endl;
       else
           cout << "Unknown command: " << cmd << endl;
@@ -189,8 +188,8 @@ namespace {
     while (is >> token)
         value += string(" ", !value.empty()) + token;
 
-    if (Options.find(name) != Options.end())
-        Options[name].set_value(value.empty() ? "true" : value); // UCI buttons don't have "value"
+    if (Options.count(name))
+        Options[name] = (value.empty() ? "true" : value); // UCI buttons don't have "value"
     else
         cout << "No such option: " << name << endl;
   }
@@ -234,7 +233,6 @@ namespace {
                 searchMoves.push_back(move_from_uci(pos, token));
     }
 
-    searchMoves.push_back(MOVE_NONE);
     limits.time = time[pos.side_to_move()];
     limits.increment = inc[pos.side_to_move()];
 
@@ -253,11 +251,11 @@ namespace {
     if (!(is >> depth))
         return;
 
-    time = get_system_time();
+    time = system_time();
 
     int64_t n = Search::perft(pos, depth * ONE_PLY);
 
-    time = get_system_time() - time;
+    time = system_time() - time;
 
     std::cout << "\nNodes " << n
               << "\nTime (ms) " << time