Fix Chess960 bug when castling does not move the rook.

[remoteglot] / remoteglot.pl

diff --git a/remoteglot.pl b/remoteglot.pl
index 66fb2ff7bb83f3cfce508f1c267a59f796988403..049cdabaafaa0f0f824bec3cb0df34f147176fe2 100755 (executable)
--- a/remoteglot.pl
+++ b/remoteglot.pl
@@ -290,6 +290,7 @@ sub handle_pgn {
                        my $pos;
                        if (exists($tags->{'FEN'})) {
                                $pos = Position->from_fen($tags->{'FEN'});
+                               $pos->{'last_move'} = 'none';
                                $pos->{'player_w'} = $white;
                                $pos->{'player_b'} = $black;
                                $pos->{'start_fen'} = $tags->{'FEN'};
@@ -299,6 +300,8 @@ sub handle_pgn {
                        if (exists($tags->{'Variant'}) &&
                            $tags->{'Variant'} =~ /960|fischer/i) {
                                $pos->{'chess960'} = 1;
+                       } else {
+                               $pos->{'chess960'} = 0;
                        }
                        my $moves = $pgn->moves;
                        my @uci_moves = ();
@@ -390,9 +393,9 @@ 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();
+       if ($engine->{'chess960'} != $pos->{'chess960'}) {
+               uciprint($engine, "setoption name UCI_Chess960 value " . ($pos->{'chess960'} ? 'true' : 'false'));
+               $engine->{'chess960'} = $pos->{'chess960'};
        }
        uciprint($engine, "position fen " . $pos->fen());
        uciprint($engine, "go infinite");
@@ -403,9 +406,9 @@ 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();
+               if ($engine2->{'chess960'} != $pos->{'chess960'}) {
+                       uciprint($engine2, "setoption name UCI_Chess960 value " . ($pos->{'chess960'} ? 'true' : 'false'));
+                       $engine2->{'chess960'} = $pos->{'chess960'};
                }
                uciprint($engine2, "position fen " . $pos->fen());
                uciprint($engine2, "go infinite");
@@ -907,6 +910,7 @@ sub output_json {
                } else {
                        $pos = Position->start_pos('white', 'black');
                }
+               $pos->{'chess960'} = $pos_calculating->{'chess960'};
                my $halfmove_num = 0;
                for my $move (@{$pos_calculating->{'history'}}) {
                        my $id = id_for_pos($pos, $halfmove_num);