From df18ffa1a77047ff0b7ad7004325bca418d7fde9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81lex=20Rom=C3=A1n=20N=C3=BA=C3=B1ez?= Date: Sat, 12 Sep 2026 17:01:15 +0200 Subject: [PATCH] Fix all warnings --- src/debug_tools.rs | 6 +----- src/fighter/attack.rs | 2 +- src/fighter/debug.rs | 7 +++---- src/fighter/state/ground_attack.rs | 8 ++------ src/input/buffer.rs | 1 - src/menus/character_select/character_box.rs | 2 +- src/menus/character_select/fighter_portrait.rs | 2 +- src/menus/character_select/mod.rs | 18 ++++++++---------- src/menus/errors.rs | 4 ++-- src/menus/main_menu.rs | 5 ++--- src/menus/mod.rs | 5 ++--- src/menus/navigation.rs | 1 - src/menus/scaling.rs | 2 -- src/menus/stage_select/mod.rs | 3 +-- src/menus/stage_select/stage_box.rs | 3 +-- 15 files changed, 25 insertions(+), 44 deletions(-) diff --git a/src/debug_tools.rs b/src/debug_tools.rs index 52b6d6e..82bc762 100644 --- a/src/debug_tools.rs +++ b/src/debug_tools.rs @@ -347,10 +347,6 @@ impl DebugSettings { self.motion_sampling.cycle(); } - fn cycle_game_speed(&mut self) { - self.motion_sampling.cycle(); - } - fn rows_mut(&mut self, handle: usize) -> &mut [FighterDebugRowKind; PLAYER_DEBUG_ROW_COUNT] { self.player_rows .entry(handle) @@ -493,7 +489,7 @@ fn handle_palette_input( } else { None }; - if let Some(direction) = direction {} + if let Some(_direction) = direction {} } if gamepad.just_pressed(GamepadButton::South) { match page { diff --git a/src/fighter/attack.rs b/src/fighter/attack.rs index f86e804..39f59d8 100644 --- a/src/fighter/attack.rs +++ b/src/fighter/attack.rs @@ -134,7 +134,7 @@ impl AttackHitbox { /// Knockback calculation pub fn calculate_knockback( &self, - attack: AttackKind, + _attack: AttackKind, receiver_attribs: &FighterAttributes, receiver_damage: FighterDamage, diff --git a/src/fighter/debug.rs b/src/fighter/debug.rs index 2b938da..3033310 100644 --- a/src/fighter/debug.rs +++ b/src/fighter/debug.rs @@ -20,7 +20,6 @@ use crate::fighter::{ }; use crate::input::FighterInput; use crate::math::int::FGi32; -use crate::math::vec3::FGVec3; use crate::player::Player; use crate::scripting::FighterAttackScript; @@ -335,11 +334,11 @@ pub fn attack_debug( &FighterFacingDirection, &FighterAnimationFrame, )>, - attack_scripts: Res>, + _attack_scripts: Res>, mut gizmos: Gizmos, ) { - for (hitboxes, matrices, translation, facing_direction, frame) in query { - if let Some(script) = &hitboxes.attack_script { + for (hitboxes, _matrices, _translation, _facing_direction, _frame) in query { + if let Some(_script) = &hitboxes.attack_script { for solved_hitbox in hitboxes.active_hitboxes_solved.iter() { let start = solved_hitbox.capsule.start.to_vec3(); let end = solved_hitbox.capsule.end.to_vec3(); diff --git a/src/fighter/state/ground_attack.rs b/src/fighter/state/ground_attack.rs index 2b52ee4..3751f0a 100644 --- a/src/fighter/state/ground_attack.rs +++ b/src/fighter/state/ground_attack.rs @@ -1,12 +1,8 @@ -use fixed::types::I16F16; -use crate::{ - fighter::{ +use crate::fighter::{ attack::{AttackKind, update_active_hitbox_list}, state::{FighterState, FighterStateImpl, ground::GroundedStateCommon, wait::WaitState}, - }, - math::int::FGi32, -}; + }; #[derive(Clone, Debug, Hash)] pub struct GroundAttackState { diff --git a/src/input/buffer.rs b/src/input/buffer.rs index ea12d6f..30b76b5 100644 --- a/src/input/buffer.rs +++ b/src/input/buffer.rs @@ -12,7 +12,6 @@ use strum_macros::EnumIter; use crate::fighter::attack::AttackKind; use crate::game_settings::GameSettings; use crate::input::FighterInputFrame; -use crate::math::int::FGi32; use crate::netcode::GGRSCfg; use crate::player::Player; diff --git a/src/menus/character_select/character_box.rs b/src/menus/character_select/character_box.rs index 499c5d8..c183712 100644 --- a/src/menus/character_select/character_box.rs +++ b/src/menus/character_select/character_box.rs @@ -1,4 +1,4 @@ -use bevy::{picking::Pickable, prelude::*, text::FontSourceTemplate, ui::widget::ImageNodeSize}; +use bevy::{picking::Pickable, prelude::*, text::FontSourceTemplate}; use crate::{ fighter::{FighterId, manifest::FighterManifest}, diff --git a/src/menus/character_select/fighter_portrait.rs b/src/menus/character_select/fighter_portrait.rs index 7c00e17..d8e486b 100644 --- a/src/menus/character_select/fighter_portrait.rs +++ b/src/menus/character_select/fighter_portrait.rs @@ -4,7 +4,7 @@ pub struct FighterPortrait { } impl FighterPortrait { - pub fn create(player_slot: usize) -> impl Scene { + pub fn create(_player_slot: usize) -> impl Scene { bsn![ Node { max_width: px(300), diff --git a/src/menus/character_select/mod.rs b/src/menus/character_select/mod.rs index 65ab645..87f03dd 100644 --- a/src/menus/character_select/mod.rs +++ b/src/menus/character_select/mod.rs @@ -1,8 +1,7 @@ use bevy::{ - picking::pointer::{PointerId, PointerLocation}, + picking::pointer::PointerId, prelude::*, }; -use bevy_egui::egui::accesskit::TextAlign; use crate::{ AppState, @@ -10,15 +9,14 @@ use crate::{ game_settings::CommonAssets, input::{LocalInputAssignments, LocalInputSource}, menus::{ - MenuMarker, build_menu_with_props, + MenuMarker, button::FGUiButton, character_select::{character_box::CharacterBox, token::CharacterSelectToken}, cursor::{FGMenuCursor, MenuCursorInputSource}, - errors::MenuErrors::{self, FighterManifestNotFound}, + errors::MenuErrors::FighterManifestNotFound, match_config::{MenuMatchConfig, MenuMatchPlayerSlot}, scaling, spawn_menu, style::{FGUiButtonType, FGUiStyle}, - wrap_menu, }, }; @@ -42,10 +40,10 @@ pub fn setup_character_select( existing_menu: Option>>, mut commands: Commands, manifest_registry: Res, - assignments: Res, + _assignments: Res, manifests: Res>, - common_assets: Res, - styles: Res>, + _common_assets: Res, + _styles: Res>, ) { let character_boxes = manifest_registry .iter() @@ -195,7 +193,7 @@ pub fn css_auto_assign_slots( #[derive(Event)] pub struct FighterSelectedEvent { - slot: usize, + _slot: usize, } pub fn select_fighter( @@ -215,7 +213,7 @@ pub fn select_fighter( .get(&character_box.fighter_manifest) .ok_or(FighterManifestNotFound)?; match_config.set_player_fighter(slot, Some(manifest.id))?; - commands.trigger(FighterSelectedEvent { slot }); + commands.trigger(FighterSelectedEvent { _slot: slot }); } } } diff --git a/src/menus/errors.rs b/src/menus/errors.rs index a07f9f0..088719f 100644 --- a/src/menus/errors.rs +++ b/src/menus/errors.rs @@ -1,6 +1,6 @@ -use bevy::{ecs::query::QueryEntityError, reflect::Reflect}; +use bevy::reflect::Reflect; -use crate::{fighter::FighterId, menus::match_config::MenuMatchConfigErrors}; +use crate::menus::match_config::MenuMatchConfigErrors; #[derive(thiserror::Error, Debug, Reflect)] pub enum MenuErrors { diff --git a/src/menus/main_menu.rs b/src/menus/main_menu.rs index f2e53b1..458974b 100644 --- a/src/menus/main_menu.rs +++ b/src/menus/main_menu.rs @@ -1,11 +1,10 @@ use bevy::{ prelude::*, text::FontSourceTemplate, - ui::auto_directional_navigation::AutoDirectionalNavigation, }; use crate::{ AppState, - menus::{MenuMarker, button::menu_button, navigation::NavigationDefaultFocus}, + menus::{button::menu_button, navigation::NavigationDefaultFocus}, }; #[derive(SceneComponent, Default, Clone)] @@ -58,4 +57,4 @@ impl MainMenu { } } -pub fn setup_main_menu(mut commands: Commands) {} +pub fn setup_main_menu(_commands: Commands) {} diff --git a/src/menus/mod.rs b/src/menus/mod.rs index b93391f..322912d 100644 --- a/src/menus/mod.rs +++ b/src/menus/mod.rs @@ -6,7 +6,6 @@ use bevy::{ prelude::*, }; -use bevy::prelude::*; use ron_asset_manager::RonAssetPlugin; use crate::{ @@ -31,7 +30,7 @@ pub struct MenuMarker {} pub struct MenuPlugin; -pub fn build_menu_scene(existing_menu: Option>>) -> impl Scene +pub fn build_menu_scene(_existing_menu: Option>>) -> impl Scene where S: SceneComponent + Default + Clone + Send + Sync, { @@ -103,7 +102,7 @@ where pub fn build_menu( existing_menu: Option>>, - mut commands: Commands, + commands: Commands, ) where S: SceneComponent + Default + Clone + Send + Sync, { diff --git a/src/menus/navigation.rs b/src/menus/navigation.rs index 529dad3..2ca7a5f 100644 --- a/src/menus/navigation.rs +++ b/src/menus/navigation.rs @@ -10,7 +10,6 @@ use bevy::{ prelude::*, ui::auto_directional_navigation::AutoDirectionalNavigator, }; -use bevy_egui::egui::IntoAtoms; use std::collections::HashSet; // Action state and input handling diff --git a/src/menus/scaling.rs b/src/menus/scaling.rs index b7a57fd..972613c 100644 --- a/src/menus/scaling.rs +++ b/src/menus/scaling.rs @@ -1,5 +1,3 @@ -use bevy::camera::CameraProjection; -use bevy::camera::Projection::Orthographic; use bevy::prelude::*; use bevy::window::WindowResized; diff --git a/src/menus/stage_select/mod.rs b/src/menus/stage_select/mod.rs index 7b9bd1c..0c256da 100644 --- a/src/menus/stage_select/mod.rs +++ b/src/menus/stage_select/mod.rs @@ -6,12 +6,11 @@ use crate::{ match_loading::initiate_match, menus::{ MenuMarker, - button::FGUiButton, cursor, match_config::MenuMatchConfig, spawn_menu, stage_select::stage_box::StageBox, - style::{FGUiButtonType, FGUiStyle}, + style::FGUiStyle, }, stage::manifest::{StageManifest, StageManifestRegistry}, }; diff --git a/src/menus/stage_select/stage_box.rs b/src/menus/stage_select/stage_box.rs index 826112a..2423c2b 100644 --- a/src/menus/stage_select/stage_box.rs +++ b/src/menus/stage_select/stage_box.rs @@ -1,7 +1,6 @@ -use bevy::{picking::Pickable, prelude::*, text::FontSourceTemplate, ui::widget::ImageNodeSize}; +use bevy::{picking::Pickable, prelude::*, text::FontSourceTemplate}; use crate::{ - fighter::{FighterId, manifest::FighterManifest}, menus::{button::FGUiButton, style::FGUiButtonType}, stage::manifest::{StageId, StageManifest}, };