From 9546df578d44991707c28df45ed4157790bf40aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=80lex=20Rom=C3=A0n?= Date: Sat, 29 Aug 2026 17:55:06 +0200 Subject: [PATCH] Fix compilation warnings --- src/fighter/attributes.rs | 6 +----- src/fighter/collision.rs | 2 -- src/fighter/ecb.rs | 1 - src/fighter/mod.rs | 7 ++----- src/fighter/state/air.rs | 2 -- src/fighter/state/dash.rs | 4 +--- src/fighter/state/ground.rs | 1 - src/fighter/state/land.rs | 3 --- src/fighter/state/walk.rs | 2 -- src/input/gamepad.rs | 4 +--- src/input/mod.rs | 2 +- src/match_loading.rs | 11 ++--------- src/math/segment.rs | 1 - 13 files changed, 8 insertions(+), 38 deletions(-) diff --git a/src/fighter/attributes.rs b/src/fighter/attributes.rs index 9ba5684..e1f5576 100644 --- a/src/fighter/attributes.rs +++ b/src/fighter/attributes.rs @@ -63,8 +63,4 @@ impl FighterAttributes { (accel, target_vel) } -} - -pub struct FighterAttributesLink { - attributes: Handle, -} +} \ No newline at end of file diff --git a/src/fighter/collision.rs b/src/fighter/collision.rs index 53aeabf..eff1bd4 100644 --- a/src/fighter/collision.rs +++ b/src/fighter/collision.rs @@ -1,7 +1,5 @@ //! Resolving an integrated fighter position against the stage. -use bevy::prelude::*; - use crate::fighter::state::FighterStateContext; use crate::math::segment::FGSegment2d; use crate::math::vec::FGVec2; diff --git a/src/fighter/ecb.rs b/src/fighter/ecb.rs index 48193b6..b05527b 100644 --- a/src/fighter/ecb.rs +++ b/src/fighter/ecb.rs @@ -1,5 +1,4 @@ use bevy::prelude::*; -use fixed::traits::Fixed; use crate::math::{int::FGi32, vec::FGVec2}; diff --git a/src/fighter/mod.rs b/src/fighter/mod.rs index 6239499..cc2dd69 100644 --- a/src/fighter/mod.rs +++ b/src/fighter/mod.rs @@ -98,7 +98,6 @@ pub struct FighterVisual; #[derive(Component)] pub struct Fighter { - id: FighterId, pub manifest: Handle, } @@ -170,8 +169,7 @@ pub fn spawn_fighter( commands: &mut Commands, player_handle: usize, spawn_position: FGVec2, - manifest: (Handle, &FighterManifest), - _attributes: FighterAttributes, + manifest: Handle, animations: FighterAnimations, visual_root: WorldAssetRoot, ) { @@ -181,8 +179,7 @@ pub fn spawn_fighter( handle: player_handle, }, Fighter { - id: manifest.1.id, - manifest: manifest.0, + manifest: manifest, }, FighterFacingDirection::Right, FighterECB { diff --git a/src/fighter/state/air.rs b/src/fighter/state/air.rs index e4fd906..74c49aa 100644 --- a/src/fighter/state/air.rs +++ b/src/fighter/state/air.rs @@ -1,5 +1,3 @@ -use fixed::traits::Fixed; - use crate::fighter::*; pub fn integrate_gravity(velocity: &mut FighterVelocity, attributes: &FighterAttributes) { diff --git a/src/fighter/state/dash.rs b/src/fighter/state/dash.rs index b8bec3d..0d9a017 100644 --- a/src/fighter/state/dash.rs +++ b/src/fighter/state/dash.rs @@ -1,6 +1,4 @@ -use std::hash::{Hash, Hasher}; - -use bevy::prelude::*; +use std::hash::{Hasher}; use super::{FighterStateContext, FighterStateImpl, ground, run, wait, walk}; use crate::fighter::FighterFacingDirection; diff --git a/src/fighter/state/ground.rs b/src/fighter/state/ground.rs index f708d9f..6eff413 100644 --- a/src/fighter/state/ground.rs +++ b/src/fighter/state/ground.rs @@ -12,7 +12,6 @@ use crate::math::vec::FGVec2; use crate::stage::line::{StageLineID, StagePolyLineSegmentType}; use bevy::prelude::*; -use fixed::traits::Fixed; #[derive(Reflect, Hash, Clone, Debug)] pub struct GroundedStateCommon { diff --git a/src/fighter/state/land.rs b/src/fighter/state/land.rs index b39fb05..1f3ad5f 100644 --- a/src/fighter/state/land.rs +++ b/src/fighter/state/land.rs @@ -1,6 +1,3 @@ - -use bevy::prelude::*; - use crate::fighter::{ animation::AnimKind, state::{ diff --git a/src/fighter/state/walk.rs b/src/fighter/state/walk.rs index 4e84fca..a55bca2 100644 --- a/src/fighter/state/walk.rs +++ b/src/fighter/state/walk.rs @@ -1,6 +1,4 @@ -use bevy::prelude::*; - use super::{FighterStateContext, FighterStateImpl, dash, ground, wait}; use crate::fighter::animation::AnimKind; use crate::fighter::state::FighterState; diff --git a/src/input/gamepad.rs b/src/input/gamepad.rs index 8a017ec..0dcc8dc 100644 --- a/src/input/gamepad.rs +++ b/src/input/gamepad.rs @@ -1,14 +1,12 @@ use bevy::math::Vec2; use bevy::prelude::*; -use fixed::traits::Fixed; -use crate::game_settings::GameSettings; use crate::input::map::GamepadBinding; use crate::input::{BaseInputMap, FighterInputFrame, InputMapAction}; use crate::math::int::FGi32; use crate::math::vec::FGVec2; -pub fn sample_gamepad(pad: &Gamepad, input_map: &BaseInputMap, _game_settings: &GameSettings) -> FighterInputFrame { +pub fn sample_gamepad(pad: &Gamepad, input_map: &BaseInputMap) -> FighterInputFrame { let mut input_frame = FighterInputFrame::default(); let mut movement = Vec2::ZERO; diff --git a/src/input/mod.rs b/src/input/mod.rs index aa7d033..ed4caba 100644 --- a/src/input/mod.rs +++ b/src/input/mod.rs @@ -134,7 +134,7 @@ fn read_local_inputs( .and_then(|entity| gamepads.get(entity).ok()); let mut input_frame = match gamepad { - Some(pad) => gamepad::sample_gamepad(pad, &input_map, &game_settings), + Some(pad) => gamepad::sample_gamepad(pad, &input_map), None => keyboard::sample_keyboard(&key, &input_map), }; diff --git a/src/match_loading.rs b/src/match_loading.rs index bb4216a..b7ec8b6 100644 --- a/src/match_loading.rs +++ b/src/match_loading.rs @@ -201,9 +201,6 @@ pub fn prepare_match( prepared.push(( scene, animations.clone(), - manifest.attributes, - manifest.camera, - manifest, manifest_handle, )); continue; @@ -250,9 +247,6 @@ pub fn prepare_match( prepared.push(( scene, animations, - manifest.attributes, - manifest.camera, - manifest, manifest_handle, )); } @@ -286,7 +280,7 @@ pub fn prepare_match( for ( index, - (player, (scene, animations, attributes, _camera_profile, manifest, manifest_handle)), + (player, (scene, animations, manifest_handle)), ) in request.players.iter().zip(prepared).enumerate() { let spawn_x = (index as i32 * 2 + 1 - request.players.len() as i32) * 5; @@ -294,8 +288,7 @@ pub fn prepare_match( &mut commands, player.handle, FGVec2::new(FGi32::from_num(spawn_x), FGi32::lit("12.5")), - (manifest_handle.clone(), manifest), - attributes, + manifest_handle.clone(), animations, WorldAssetRoot(scene), ); diff --git a/src/math/segment.rs b/src/math/segment.rs index 4b0d206..207ed9d 100644 --- a/src/math/segment.rs +++ b/src/math/segment.rs @@ -1,6 +1,5 @@ use bevy::prelude::*; -use fixed::prelude::*; use crate::math::{ int::{FGWide, FGi32},