Fix some clippy nits
This commit is contained in:
parent
a07416dce8
commit
43d3761bbf
|
@ -468,7 +468,7 @@ impl GameState {
|
||||||
let mut possible_moves = HashSet::new();
|
let mut possible_moves = HashSet::new();
|
||||||
for (pos, piece) in &self.board {
|
for (pos, piece) in &self.board {
|
||||||
if &piece.color == color {
|
if &piece.color == color {
|
||||||
possible_moves.extend(piece.get_possible_moves(&pos, &self));
|
possible_moves.extend(piece.get_possible_moves(pos, self));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
possible_moves
|
possible_moves
|
||||||
|
@ -489,15 +489,7 @@ impl GameState {
|
||||||
return Some(GameOutcome::WhiteWin);
|
return Some(GameOutcome::WhiteWin);
|
||||||
}
|
}
|
||||||
|
|
||||||
if !self.player_in_check(&Color::White)
|
if self.is_stalemate() {
|
||||||
&& self.get_possible_moves(&Color::White).is_empty()
|
|
||||||
&& self.allowed_turn == Color::White
|
|
||||||
{
|
|
||||||
return Some(GameOutcome::Draw);
|
|
||||||
} else if !self.player_in_check(&Color::Black)
|
|
||||||
&& self.get_possible_moves(&Color::Black).is_empty()
|
|
||||||
&& self.allowed_turn == Color::Black
|
|
||||||
{
|
|
||||||
return Some(GameOutcome::Draw);
|
return Some(GameOutcome::Draw);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -506,18 +498,16 @@ impl GameState {
|
||||||
if self.board.len() <= 4 {
|
if self.board.len() <= 4 {
|
||||||
let mut white_pieces = 0;
|
let mut white_pieces = 0;
|
||||||
let mut black_pieces = 0;
|
let mut black_pieces = 0;
|
||||||
for (_, piece) in &self.board {
|
for piece in self.board.values() {
|
||||||
if piece.kind == PieceKind::Rook
|
if piece.kind == PieceKind::Rook
|
||||||
|| piece.kind == PieceKind::Queen
|
|| piece.kind == PieceKind::Queen
|
||||||
|| piece.kind == PieceKind::Pawn
|
|| piece.kind == PieceKind::Pawn
|
||||||
{
|
{
|
||||||
is_insufficient = false;
|
is_insufficient = false;
|
||||||
|
} else if piece.color == Color::White {
|
||||||
|
white_pieces += 1;
|
||||||
} else {
|
} else {
|
||||||
if piece.color == Color::White {
|
black_pieces += 1;
|
||||||
white_pieces += 1;
|
|
||||||
} else {
|
|
||||||
black_pieces += 1;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if white_pieces > 2 || black_pieces > 2 {
|
if white_pieces > 2 || black_pieces > 2 {
|
||||||
|
@ -531,6 +521,11 @@ impl GameState {
|
||||||
None
|
None
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fn is_stalemate(&self) -> bool {
|
||||||
|
!self.player_in_check(&self.allowed_turn)
|
||||||
|
&& self.get_possible_moves(&self.allowed_turn).is_empty()
|
||||||
|
}
|
||||||
|
|
||||||
fn apply_move(&mut self, board_move: &Move) {
|
fn apply_move(&mut self, board_move: &Move) {
|
||||||
let from = board_move.from.clone();
|
let from = board_move.from.clone();
|
||||||
let to = board_move.to.clone();
|
let to = board_move.to.clone();
|
||||||
|
|
Loading…
Reference in a new issue