X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=remoteglot.pl;h=cf9d119b52be7e3160b43d8fb1542ac9dd753377;hp=bd10cd020475f50a4b3ca0db6e08108e3babead6;hb=6264793ac51342a676296c4a17a10e542a1d248f;hpb=9e923c34a6788eb9780a151316b196d4a18c3bbd

diff --git a/remoteglot.pl b/remoteglot.pl
index bd10cd0..cf9d119 100755
--- a/remoteglot.pl
+++ b/remoteglot.pl
@@ -164,27 +164,7 @@ while (1) {
 	
 	# any fun on the UCI channel?
 	if ($nfound > 0 && vec($rout, fileno($engine->{'read'}), 1) == 1) {
-		# 
-		# Read until we've got a full line -- if the engine sends part of
-		# a line and then stops we're pretty much hosed, but that should
-		# never happen.
-		#
-		my $line = '';
-		while ($line !~ /\n/) {
-			my $tmp;
-			my $ret = sysread $engine->{'read'}, $tmp, 1;
-
-			if (!defined($ret)) {
-				next if ($!{EINTR});
-				die "error in reading from the UCI engine: $!";
-			} elsif ($ret == 0) {
-				die "EOF from UCI engine";
-			}
-
-			$line .= $tmp;
-		}
-
-		$line =~ tr/\r\n//d;
+		my $line = read_line($engine->{'read'});
 		handle_uci($line);
 		$sleep = 0;
 
@@ -586,7 +566,7 @@ sub output_screen {
 	# specified.
 	#
 	if (exists($uciinfo{'pv1'}) && !exists($uciinfo{'pv2'})) {
-		for my $key qw(pv score_cp score_mate nodes nps depth seldepth tbhits) {
+		for my $key (qw(pv score_cp score_mate nodes nps depth seldepth tbhits)) {
 			if (exists($uciinfo{$key . '1'}) && !exists($uciinfo{$key})) {
 				$uciinfo{$key} = $uciinfo{$key . '1'};
 			}
@@ -873,11 +853,17 @@ sub can_reach {
 		return (can_reach($board, 'R', $from_row, $from_col, $to_row, $to_col) ||
 		        can_reach($board, 'B', $from_row, $from_col, $to_row, $to_col));
 	}
+
+	# TODO: en passant
 	if ($piece eq 'p') {
 		# black pawn
 		if ($to_col == $from_col && $to_row == $from_row + 1) {
 			return ($dest_piece eq '-');
 		}
+		if ($to_col == $from_col && $from_row == 1 && $to_row == 3) {
+			my $middle_piece = substr($board->[2], $to_col, 1);
+			return ($dest_piece eq '-' && $middle_piece eq '-');
+		}
 		if (abs($to_col - $from_col) == 1 && $to_row == $from_row + 1) {
 			return ($dest_piece ne '-');
 		}
@@ -888,6 +874,10 @@ sub can_reach {
 		if ($to_col == $from_col && $to_row == $from_row - 1) {
 			return ($dest_piece eq '-');
 		}
+		if ($to_col == $from_col && $from_row == 6 && $to_row == 4) {
+			my $middle_piece = substr($board->[5], $to_col, 1);
+			return ($dest_piece eq '-' && $middle_piece eq '-');
+		}
 		if (abs($to_col - $from_col) == 1 && $to_row == $from_row - 1) {
 			return ($dest_piece ne '-');
 		}
@@ -1021,3 +1011,30 @@ sub open_engine {
 	
 	return $engine;
 }
+
+sub read_line {
+	my $fh = shift;
+
+	# 
+	# Read until we've got a full line -- if the engine sends part of
+	# a line and then stops we're pretty much hosed, but that should
+	# never happen.
+	#
+	my $line = '';
+	while ($line !~ /\n/) {
+		my $tmp;
+		my $ret = sysread $engine->{'read'}, $tmp, 1;
+
+		if (!defined($ret)) {
+			next if ($!{EINTR});
+			die "error in reading from the UCI engine: $!";
+		} elsif ($ret == 0) {
+			die "EOF from UCI engine";
+		}
+
+		$line .= $tmp;
+	}
+
+	$line =~ tr/\r\n//d;
+	return $line;
+}