szymon/checkers
1
0
Fork 0
mirror of https://github.com/szymon-jozef/checkers.git synced 2026-10-27 19:20:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: clippy

Browse Source
This commit is contained in:
szymon
2026-09-05 15:50:52 +02:00
parent 1a21405927
commit f580adf743
17 changed files with 56 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ui/macroquad/difficulty_selection.rs
View File

@@ -5,7 +5,7 @@ use macroquad::{
math::vec2,
shapes::draw_rectangle,
ui::{hash, root_ui, widgets::Group},
window::{next_frame, screen_height, screen_width},
window::{screen_height, screen_width},
};
use crate::{
@@ -72,7 +72,7 @@ fn start_single(state: &mut GuiState, context: &GameContext) {
let result = rx.recv();
if let Ok(result) = result {
if let Ok(_result) = result {
connect_bot(context.difficulty);
}

22
src/ui/macroquad/game/board.rs
View File

@@ -185,9 +185,9 @@ impl Board {
self.highlight_move_paths(from);
if let Some(field) = &self.get_clicked_field() {
if let Some(available_moves) = &self.available_moves {
if available_moves.iter().any(|available_move| {
if let Some(field) = &self.get_clicked_field()
&& let Some(available_moves) = &self.available_moves
&& available_moves.iter().any(|available_move| {
available_move.from == from
&& available_move.available_steps.contains(&field.pos)
}) {
@@ -197,8 +197,6 @@ impl Board {
});
self.state = BoardState::View;
}
}
}
}
BoardState::ChooseCapture(from) => {
@@ -230,8 +228,8 @@ impl Board {
.copied()
.collect();
if let Some(clicked_field) = &self.get_clicked_field().map(|field| field.pos) {
if possible_moves.iter().any(|possible_move| {
if let Some(clicked_field) = &self.get_clicked_field().map(|field| field.pos)
&& possible_moves.iter().any(|possible_move| {
if let Some(valid_move) = possible_move.get(self.current_deepness) {
valid_move == clicked_field
} else {
@@ -241,7 +239,6 @@ impl Board {
self.current_capture_path.push(*clicked_field);
self.current_deepness += 1;
}
}
if current_highlight.is_empty() {
debug!("Capture path complete!");
@@ -278,7 +275,6 @@ impl Board {
&& available_moves.iter().any(|path| path.from == from)
{
self.state = BoardState::ChooseMove(from);
return;
}
}
@@ -324,8 +320,8 @@ impl Board {
for field in &self.board_view {
let pos: Position = field.position;
let is_row_even: bool = pos.row % 2 == 0;
let is_column_even: bool = pos.column % 2 == 0;
let is_row_even: bool = pos.row.is_multiple_of(2);
let is_column_even: bool = pos.column.is_multiple_of(2);
let is_field_black: bool = is_row_even ^ is_column_even;
let abs_x = self.rect.x + pos.column as f32 * self.field_size;
@@ -453,9 +449,7 @@ impl Board {
for available_move in available_moves {
self.fields[available_move.from].color = MOVE_HIGHLITGHT_COLOR;
}
return;
};
}
}
fn highlight_move_paths(&mut self, from: Position) {

7
src/ui/macroquad/game/chat.rs
View File

@@ -1,4 +1,3 @@
use log::debug;
use macroquad::{
color::{BLACK, WHITE},
math::{Rect, vec2},
@@ -6,7 +5,7 @@ use macroquad::{
text::measure_text,
ui::{
Skin, Ui, hash, root_ui,
widgets::{Group, InputText, Label},
widgets::{Group, InputText},
},
window::{screen_height, screen_width},
};
@@ -86,7 +85,7 @@ impl Chat {
.ui(&mut root_ui(), |ui| {
for message in &self.messages {
if prev_sender != message.sender {
if prev_sender != "" {
if !prev_sender.is_empty() {
// make space if it's not the first message
ui.label(None, "");
}
@@ -108,7 +107,7 @@ fn wrap_message(ui: &mut Ui, msg: &String, font_size: u16, chat_width: f32) {
let mut buffer = String::new();
if measure_text(msg, None, font_size, 1.0).width < chat_width {
ui.label(None, &msg);
ui.label(None, msg);
return;
}

23
src/ui/macroquad/game/game.rs
View File

@@ -12,10 +12,7 @@ use macroquad::{
use tokio::sync::mpsc::{Receiver, error::TryRecvError::Disconnected};
use crate::{
logic::board::{
board_view::BoardView,
pawn::{CapturePath, MovePath},
},
logic::board::pawn::{CapturePath, MovePath},
network::{
client::Client, message::ServerMessage, network_identity::NetworkIdentity,
server::ServerStage,
@@ -66,7 +63,7 @@ pub enum GuiCommands {
}
impl GameClient {
pub fn new(mut client: Client, context: &GameContext) -> Option<Self> {
pub fn new(mut client: Client, _context: &GameContext) -> Option<Self> {
let Some(update_receiver) = client.get_update_receiver() else {
return None;
};
@@ -226,15 +223,11 @@ impl GameClient {
}
for key in get_keys_pressed() {
match key {
KeyCode::Enter => {
self.chat.send_message(self.cmd_sender.clone()); // not sure about cloning this
// every message sent. Maybe
// Chat should have it's own
// clone?
}
_ => {}
if key == KeyCode::Enter {
self.chat.send_message(self.cmd_sender.clone()); // not sure about cloning this
// every message sent. Maybe
// Chat should have it's own
// clone?
}
}
@@ -288,7 +281,7 @@ impl GameClient {
self.chat.push_message(sender, content);
}
ServerMessage::GameEnd { result } => {
ServerMessage::GameEnd { result: _ } => {
self.game_state = ServerStage::End;
}

6
src/ui/macroquad/main_menu.rs
View File

@@ -1,9 +1,9 @@
use macroquad::{
color::{BLACK, GRAY, WHITE},
color::GRAY,
math::vec2,
shapes::draw_rectangle,
ui::{Skin, hash, root_ui, widgets::Group},
window::{next_frame, screen_height, screen_width},
ui::{hash, root_ui, widgets::Group},
window::{screen_height, screen_width},
};
use crate::ui::{macroquad::menu_builder::MenuBuilder, state::GuiState};

2
src/ui/macroquad/mode_selection.rs
View File

@@ -3,7 +3,7 @@ use macroquad::{
math::vec2,
shapes::draw_rectangle,
ui::{hash, root_ui, widgets::Group},
window::{next_frame, screen_height, screen_width},
window::{screen_height, screen_width},
};
use crate::ui::{

4
src/ui/macroquad/server_selection.rs
View File

@@ -5,7 +5,7 @@ use macroquad::{
math::vec2,
shapes::draw_rectangle,
ui::{hash, root_ui, widgets::Group},
window::{next_frame, screen_height, screen_width},
window::{screen_height, screen_width},
};
use crate::ui::{
@@ -40,7 +40,7 @@ pub async fn draw_server_selection(state: &mut GuiState, context: &mut GameConte
let result = rx.recv();
if let Ok(result) = result {
if let Ok(_result) = result {
*state = GuiState::Connecting(connect_to_server());
}
}

2
src/ui/macroquad/settings.rs
View File

@@ -52,7 +52,7 @@ pub async fn draw_settings(
menu_builder.label(ui, "TODO");
if let Some(error_msg) = &context.latest_error_message {
menu_builder.label(ui, &error_msg);
menu_builder.label(ui, error_msg);
}
// Exit