X-Git-Url: https://git.sesse.net/?p=remoteglot;a=blobdiff_plain;f=Board.pm;h=7e120053144691af3edaf0377f7446ab7f5f7e79;hp=ff2828af82b03c60f6e2fcef4dd341e8d2d6ed0e;hb=c72e3b309fe7f844eead4a23918978225d5c30fa;hpb=2ec5e8902926f0e192fb119f3955dab2564816aa

diff --git a/Board.pm b/Board.pm
index ff2828a..7e12005 100644
--- a/Board.pm
+++ b/Board.pm
@@ -25,9 +25,7 @@ sub clone {
 	my $nb = [];
 
 	for my $row (0..7) {
-		for my $col (0..7) {
-			$nb->[$row][$col] = $board->[$row][$col];
-		}
+		$nb->[$row] = [ @{$board->[$row]} ];
 	}
 
 	return bless $nb;
@@ -184,8 +182,10 @@ sub parse_pretty_move {
 	
 	# Find all possible from-squares that could have been meant.
 	my @squares = ();
+	my $side = 'K';
 	if ($toplay eq 'B') {
 		$piece = lc($piece);
+		$side = 'k';
 	}
 	for my $row (0..7) {
 		next if (defined($from_row) && $from_row != $row);
@@ -196,11 +196,7 @@ sub parse_pretty_move {
 
 			# See if doing this move would put us in check
 			# (yes, there are clients that expect us to do this).
-			my $check = $board->make_move($row, $col, $to_row, $to_col, $promo)->in_check();
-			next if ($check eq 'both' ||
-			         ($toplay eq 'W' && $check eq 'white') ||
-			         ($toplay eq 'B' && $check eq 'black'));
-
+			next if ($board->make_move($row, $col, $to_row, $to_col, $promo)->in_check($side));
 			push @squares, [ $row, $col ];
 		}
 	}
@@ -340,64 +336,48 @@ sub can_reach {
 	return 0;
 }
 
-# Returns 'none', 'white', 'black' or 'both', depending on which sides are in check.
-# The latter naturally indicates an invalid position.
-sub in_check {
-	my $board = shift;
-	my ($black_check, $white_check) = (0, 0);
+my %pieces_against_side = (
+	k => { K => 1, Q => 1, R => 1, N => 1, B => 1, P => 1 },
+	K => { k => 1, q => 1, r => 1, n => 1, b => 1, p => 1 },
+);
 
-	my ($wkr, $wkc, $bkr, $bkc) = _find_kings($board);
+# Returns whether the given side (given as k or K for black and white) is in check.
+sub in_check {
+	my ($board, $side) = @_;
+	my ($kr, $kc) = _find_piece($board, $side);
 
-	# check all pieces for the possibility of threatening the two kings
+	# check all pieces for the possibility of threatening this king
 	for my $row (0..7) {
+		next unless grep { exists($pieces_against_side{$side}{$_}) } @{$board->[$row]};
 		for my $col (0..7) {
 			my $piece = $board->[$row][$col];
 			next if ($piece eq '-');
-		
-			if (uc($piece) eq $piece) {
-				# white piece
-				$black_check = 1 if ($board->can_reach($piece, $row, $col, $bkr, $bkc));
-			} else {
-				# black piece
-				$white_check = 1 if ($board->can_reach($piece, $row, $col, $wkr, $wkc));
-			}
+			return 1 if ($board->can_reach($piece, $row, $col, $kr, $kc));
 		}
 	}
 
-	if ($black_check && $white_check) {
-		return 'both';
-	} elsif ($black_check) {
-		return 'black';
-	} elsif ($white_check) {
-		return 'white';
-	} else {
-		return 'none';
-	}
+	return 0;
 }
 
-sub _find_kings {
-	my $board = shift;
-	my ($wkr, $wkc, $bkr, $bkc);
+sub _find_piece {
+	my ($board, $piece) = @_;
 
 	for my $row (0..7) {
+		next unless grep { $_ eq $piece } @{$board->[$row]};
 		for my $col (0..7) {
-			my $piece = $board->[$row][$col];
-			if ($piece eq 'K') {
-				($wkr, $wkc) = ($row, $col);
-			} elsif ($piece eq 'k') {
-				($bkr, $bkc) = ($row, $col);
+			if ($board->[$row][$col] eq $piece) {
+				return ($row, $col);
 			}
 		}
 	}
 
-	return ($wkr, $wkc, $bkr, $bkc);
+	return (undef, undef);
 }
 
-# Returns if any side is in mate.
+# Returns if the given side (given as k or K) is in mate.
 sub in_mate {
-	my $board = shift;
-	my $check = $board->in_check();
-	return 0 if ($check eq 'none');
+	my ($board, $side, $in_check) = @_;
+	return 0 if (!$in_check);
 
 	# try all possible moves for the side in check
 	for my $row (0..7) {
@@ -405,7 +385,7 @@ sub in_mate {
 			my $piece = $board->[$row][$col];
 			next if ($piece eq '-');
 
-			if ($check eq 'white') {
+			if ($side eq 'K') {
 				next if ($piece eq lc($piece));
 			} else {
 				next if ($piece eq uc($piece));
@@ -416,11 +396,8 @@ sub in_mate {
 					next if ($row == $dest_row && $col == $dest_col);
 					next unless ($board->can_reach($piece, $row, $col, $dest_row, $dest_col));
 
-					my $nb = $board->clone();
-					$nb->[$row][$col] = '-';
-					$nb->[$dest_row][$dest_col] = $piece;
-					my $new_check = $nb->in_check();
-					return 0 if ($new_check ne $check && $new_check ne 'both');
+					my $nb = $board->make_move($row, $col, $dest_row, $dest_col);
+					return 0 if (!$nb->in_check($side));
 				}
 			}
 		}
@@ -436,9 +413,13 @@ sub prettyprint_move {
 	my $pretty = $board->_prettyprint_move_no_check_or_mate($from_row, $from_col, $to_row, $to_col, $promo);
 
 	my $nb = $board->make_move($from_row, $from_col, $to_row, $to_col, $promo);
-	if ($nb->in_mate()) {
+
+	my $piece = $board->[$from_row][$from_col];
+	my $other_side = (uc($piece) eq $piece) ? 'k' : 'K';
+	my $in_check = $nb->in_check($other_side);
+	if ($nb->in_mate($other_side, $in_check)) {
 		$pretty .= '#';
-	} elsif ($nb->in_check() ne 'none') {
+	} elsif ($in_check) {
 		$pretty .= '+';
 	}
 	return ($pretty, $nb);