Use the prettyprinted files from the protobuf. Leave the old code in place in case...

[remoteglot] / Board.pm

diff --git a/Board.pm b/Board.pm
index 8573bd8f29814e7cdce82555332b4eda3dc612b0..720189899045eb72ea25850167e98613c2c374a5 100644 (file)
--- a/Board.pm
+++ b/Board.pm
@@ -200,15 +200,14 @@ sub parse_pretty_move {
                        push @squares, [ $row, $col ];
                }
        }
-       if (scalar @squares > 1) {
-               # Filter out pieces which cannot reach this square.
-               @squares = grep { $board->can_reach($piece, $_->[0], $_->[1], $to_row, $to_col) } @squares;
-       }
-       if (scalar @squares > 1) {
-               # See if doing this move would put us in check
-               # (yes, there are clients that expect us to do this).
-               @squares = grep { !$board->make_move($_->[0], $_->[1], $to_row, $to_col, $promo)->in_check($side) } @squares;
-       }
+
+       # Filter out pieces which cannot reach this square.
+       @squares = grep { $board->can_reach($piece, $_->[0], $_->[1], $to_row, $to_col) } @squares;
+
+       # See if doing this move would put us in check
+       # (yes, there are clients that expect us to do this).
+       @squares = grep { !$board->make_move($_->[0], $_->[1], $to_row, $to_col, $promo)->in_check($side) } @squares;
+
        if (scalar @squares == 0) {
                die "Impossible move $move";
        }
@@ -514,22 +513,22 @@ sub _prettyprint_move_no_check_or_mate {
 
        # white short castling
        if ($move eq 'e1g1' && $piece eq 'K') {
-               return '0-0';
+               return 'O-O';
        }
 
        # white long castling
        if ($move eq 'e1c1' && $piece eq 'K') {
-               return '0-0-0';
+               return 'O-O-O';
        }
 
        # black short castling
        if ($move eq 'e8g8' && $piece eq 'k') {
-               return '0-0';
+               return 'O-O';
        }
 
        # black long castling
        if ($move eq 'e8c8' && $piece eq 'k') {
-               return '0-0-0';
+               return 'O-O-O';
        }
 
        my $pretty;
@@ -541,12 +540,12 @@ sub _prettyprint_move_no_check_or_mate {
                        $pretty = substr($move, 0, 1) . 'x' . _pos_to_square($to_row, $to_col);
                } else {
                        $pretty = _pos_to_square($to_row, $to_col);
+               }
 
-                       if (defined($promo) && $promo ne '') {
-                               # promotion
-                               $pretty .= "=";
-                               $pretty .= uc($promo);
-                       }
+               if (defined($promo) && $promo ne '') {
+                       # promotion
+                       $pretty .= "=";
+                       $pretty .= uc($promo);
                }
                return $pretty;
        }