From: Steinar H. Gunderson <sgunderson@bigfoot.com>
Date: Tue, 15 Nov 2016 18:10:20 +0000 (+0100)
Subject: Reject more invalid moves.
X-Git-Url: https://git.sesse.net/?p=remoteglot;a=commitdiff_plain;h=72de1da79baf2dddf6b37374aeb27bd3576af596

Reject more invalid moves.
---

diff --git a/Board.pm b/Board.pm
index 3e0fd33..7201898 100644
--- 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";
 	}