Inform the engine if we have a Chess960 game.

diff --git a/Engine.pm b/Engine.pm
index 6ec914fb42c8bf7e98909d36e9c5a7aebf1fad4a..c46b4a8d313f3adfdcd9ac8a7e9301c0a5dd6f85 100644 (file)
--- a/Engine.pm
+++ b/Engine.pm
@@ -30,6 +30,7 @@ sub open {
                cb => $cb,
                seen_uciok => 0,
                stopping => 0,
+               chess960 => 0,
        };
 
        print $uciwrite "uci\n";

diff --git a/Position.pm b/Position.pm
index 6976c96b68958880b0c58932a58cae0bedd92a14..8a42a6fa39f59f9e42bd80ec08bb5d7719a759e7 100644 (file)
--- a/Position.pm
+++ b/Position.pm
@@ -221,6 +221,9 @@ sub make_move {
        if (exists($pos->{'start_fen'})) {
                $np->{'start_fen'} = $pos->{'start_fen'};
        }
+       if (exists($pos->{'chess960'})) {
+               $np->{'chess960'} = $pos->{'chess960'};
+       }
        if (defined($pretty_move)) {
                $np->{'last_move'} = $pretty_move;
        } else {
@@ -242,6 +245,11 @@ sub make_pretty_move {
        return ($pos, $uci_move);
 }
 
+sub is_chess960 {
+       my ($pos) = shift;
+       return (defined($pos->{'chess960'}) && $pos->{'chess960'});
+}
+
 sub _pos_to_square {
         my ($row, $col) = @_;
         return sprintf("%c%d", ord('a') + $col, 8 - $row);

diff --git a/remoteglot.pl b/remoteglot.pl
index 7f4fd3c2ddc58d03fff0b0a276236572cfffe993..66fb2ff7bb83f3cfce508f1c267a59f796988403 100755 (executable)
--- a/remoteglot.pl
+++ b/remoteglot.pl
@@ -296,6 +296,10 @@ sub handle_pgn {
                        } else {
                                $pos = Position->start_pos($white, $black);
                        }
+                       if (exists($tags->{'Variant'}) &&
+                           $tags->{'Variant'} =~ /960|fischer/i) {
+                               $pos->{'chess960'} = 1;
+                       }
                        my $moves = $pgn->moves;
                        my @uci_moves = ();
                        my @repretty_moves = ();
@@ -386,6 +390,10 @@ sub handle_position {
        # It's wrong to just give the FEN (the move history is useful,
        # and per the UCI spec, we should really have sent "ucinewgame"),
        # but it's easier, and it works around a Stockfish repetition issue.
+       if ($engine->{'chess960'} != $pos->is_chess960()) {
+               uciprint($engine, "setoption UCI_Chess960 " . ($pos->is_chess960() ? 'true' : 'false'));
+               $engine->{'chess960'} = $pos->is_chess960();
+       }
        uciprint($engine, "position fen " . $pos->fen());
        uciprint($engine, "go infinite");
        $pos_calculating = $pos;
@@ -395,6 +403,10 @@ sub handle_position {
                        $engine2->{'stopping'} = 1;
                        uciprint($engine2, "stop");
                }
+               if ($engine2->{'chess960'} != $pos->is_chess960()) {
+                       uciprint($engine2, "setoption UCI_Chess960 " . ($pos->is_chess960() ? 'true' : 'false'));
+                       $engine2->{'chess960'} = $pos->is_chess960();
+               }
                uciprint($engine2, "position fen " . $pos->fen());
                uciprint($engine2, "go infinite");
                $pos_calculating_second_engine = $pos;