X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=xboard2uci.c;h=6dda5cf491bad8fe9875eadf65ae7d057a40aa98;hb=a8209ad25e331b9938321744c3cf0e03867eac1c;hp=529f041ffec618a1c70958a0952c3b8e39a5a36d;hpb=acb140befabd8b0f1a8606470013b420d05b4fb7;p=polyglot.git

diff --git a/xboard2uci.c b/xboard2uci.c
index 529f041..6dda5cf 100644
--- a/xboard2uci.c
+++ b/xboard2uci.c
@@ -454,11 +454,17 @@ void xboard2uci_gui_step(char string[]) {
                 char *pg_name=Star[0];
                 polyglot_set_option(pg_name,value);
             }else{
-                start_protected_command();
-                if(!uci_send_option(Uci, name, "%s", value)){
+                option_t *opt=option_find(Uci->option,name);
+                if(opt){
+                    if(my_string_case_equal(opt->type,"check")){
+                       value=my_string_equal(value,"1")?"true":"false";
+                    }
+                    start_protected_command();
+                    uci_send_option(Uci, name, "%s", value);
+                    end_protected_command();
+                }else{
                     gui_send(GUI,"Error (unknown option): %s",name); 
                 }
-                end_protected_command();
             }
         } else if (match(string,"option *")){
             char *name=Star[0];
@@ -740,6 +746,7 @@ void xboard2uci_engine_step(char string[]) {
                 gui_send(GUI,"1-0 {polyglot: resign"
                          " (illegal engine move black)}");
             }
+            board_disp(board);
             XB->result = TRUE;
             mess();
         }
@@ -851,6 +858,13 @@ static void send_xboard_options(){
     option_start_iter(Uci->option);
     while((opt=option_next(Uci->option))){
         if(my_string_case_equal(opt->name,"UCI_AnalyseMode")) continue;
+        if(my_string_case_equal(opt->name,"UCI_Opponent")) continue;
+        if(my_string_case_equal(opt->name,"UCI_Chess960")) continue;
+        if(my_string_case_equal(opt->name,"UCI_ShowCurrLine")) continue;
+        if(my_string_case_equal(opt->name,"UCI_ShowRefutations")) continue;
+        if(my_string_case_equal(opt->name,"UCI_ShredderbasesPath")) continue;
+        if(my_string_case_equal(opt->name,"UCI_SetPositionValue")) continue;
+        if(my_string_case_equal(opt->name,"UCI_DrawOffers")) continue;
         if(my_string_case_equal(opt->name,"Ponder")) continue;
         if(my_string_case_equal(opt->name,"Hash")) continue;
         if(my_string_case_equal(opt->name,"NalimovPath")) continue;
@@ -1190,11 +1204,17 @@ static void search_update() {
 
    if (State->state == THINK || State->state == PONDER || State->state == ANALYSE) {
 
+      // [VdB] moved up as we need the move number
+
+       game_get_board(Game,Uci->board);
+
       // opening book
 
-       if (State->state == THINK && option_get_bool(Option,"Book")) {
+       if (State->state == THINK &&
+           option_get_bool(Option,"Book") &&
+           Uci->board->move_nb<option_get_int(Option,"BookDepth")
+           ) {
 
-         game_get_board(Game,Uci->board);
 
          move = book_move(Uci->board,option_get_bool(Option,"BookRandom"));
 
@@ -1463,7 +1483,7 @@ static void send_board(int extra_move) {
 
 static void send_info() {
     int min_depth;
-    if(option_get_bool(Option,"WbWorkArounds")){
+    if(option_get_bool(Option,"WbWorkArounds2")){
             // Silly bug in some versions of WinBoard.
             // depth <=1 clears the engine output window.
             // Why shouldn't an engine be allowed to send info at depth 1?