cleaning up warnings

Author: it-me-joda

src/game/audio/soundtrack.rs

@@ -22,7 +22,6 @@ fn play_soundtrack(
 
     let soundtrack_key = match trigger.event() {
         PlaySoundtrack::Key(key) => *key,
-        PlaySoundtrack::Disable => return,
     };
     commands.spawn((
         AudioSourceBundle {
@@ -43,7 +42,6 @@ fn play_soundtrack(
 #[derive(Event)]
 pub enum PlaySoundtrack {
     Key(SoundtrackKey),
-    Disable,
 }
 
 /// Marker component for the soundtrack entity so we can find it later.

src/game/spawn/clock.rs

@@ -47,32 +47,22 @@ pub(super) fn plugin(app: &mut App) {
         clocks: vec![
             ClockData {
                 time_left: 0.0,
-                hour_start_rotation: 0.0,
-                minute_start_rotation: 1.0,
                 audio: SfxKey::Ticking2,
             },
             ClockData {
                 time_left: 0.0,
-                hour_start_rotation: 2.0,
-                minute_start_rotation: 3.0,
                 audio: SfxKey::Ticking3,
             },
             ClockData {
                 time_left: 0.0,
-                hour_start_rotation: 4.0,
-                minute_start_rotation: 5.0,
                 audio: SfxKey::Ticking4,
             },
             ClockData {
                 time_left: 0.0,
-                hour_start_rotation: 6.0,
-                minute_start_rotation: 7.0,
                 audio: SfxKey::Ticking5,
             },
             ClockData {
                 time_left: 0.0,
-                hour_start_rotation: 8.0,
-                minute_start_rotation: 9.0,
                 audio: SfxKey::Ticking6,
             },
         ],
@@ -133,8 +123,6 @@ pub struct Clocks {
 
 pub struct ClockData {
     pub time_left: f32,
-    pub hour_start_rotation: f32,
-    pub minute_start_rotation: f32,
     pub audio: SfxKey,
 }
 
@@ -478,17 +466,6 @@ fn spawn_interact_clock(
     let translation = positions.clock_spawn;
     let clock_data = &clock_data.clocks[clock_count];
 
-    let mut hour_transform = Transform {
-        translation: Vec3::new(0.0, 0.0, 300.0),
-        ..default()
-    };
-    // hour_transform.rotate_z(clock_data.hour_start_rotation);
-
-    let mut minute_transform = Transform {
-        translation: Vec3::new(0.0, 0.0, 400.0),
-        ..default()
-    };
-    // minute_transform.rotate_z(clock_data.minute_start_rotation);
     commands
         .spawn((
             Name::new("Clock"),
@@ -517,7 +494,10 @@ fn spawn_interact_clock(
             parent.spawn((
                 SpriteBundle {
                     texture: image_handles[&ImageKey::ClockHour].clone_weak(),
-                    transform: hour_transform,
+                    transform: Transform {
+                        translation: Vec3::new(0.0, 0.0, 300.0),
+                        ..default()
+                    },
                     sprite: Sprite {
                         custom_size: Some(Vec2::new(90.0, 90.0)),
                         ..default()
@@ -530,7 +510,10 @@ fn spawn_interact_clock(
             parent.spawn((
                 SpriteBundle {
                     texture: image_handles[&ImageKey::ClockMinute].clone_weak(),
-                    transform: minute_transform,
+                    transform: Transform {
+                        translation: Vec3::new(0.0, 0.0, 400.0),
+                        ..default()
+                    },
                     sprite: Sprite {
                         custom_size: Some(Vec2::new(90.0, 90.0)),
                         ..default()

src/game/spawn/player.rs

@@ -3,7 +3,7 @@ use bevy::prelude::*;
 use crate::{
     game::{
         assets::{HandleMap, ImageKey, SfxKey},
-        audio::sfx::{PlayLoopingSfx, PlaySfx, StopLoopingSfx},
+        audio::sfx::{PlayLoopingSfx, StopLoopingSfx},
         movement::MovementController,
     },
     screen::Screen,

src/screen/credits.rs

@@ -10,7 +10,6 @@ use crate::{
 
 pub(super) fn plugin(app: &mut App) {
     app.add_systems(OnEnter(Screen::Credits), enter_credits);
-    app.add_systems(OnExit(Screen::Credits), exit_credits);
 
     app.add_systems(
         Update,
@@ -44,10 +43,6 @@ fn enter_credits(mut commands: Commands) {
     commands.trigger(PlaySoundtrack::Key(SoundtrackKey::Credits));
 }
 
-fn exit_credits(mut commands: Commands) {
-    // commands.trigger(PlaySoundtrack::Disable);
-}
-
 fn handle_credits_action(
     mut commands: Commands,
     mut next_screen: ResMut<NextState<Screen>>,

src/screen/playing.rs

@@ -9,7 +9,6 @@ use crate::game::{
 
 pub(super) fn plugin(app: &mut App) {
     app.add_systems(OnEnter(Screen::Playing), enter_playing);
-    app.add_systems(OnExit(Screen::Playing), exit_playing);
 
     app.add_systems(
         Update,
@@ -23,11 +22,6 @@ fn enter_playing(mut commands: Commands) {
     commands.trigger(PlaySoundtrack::Key(SoundtrackKey::Gameplay));
 }
 
-fn exit_playing(mut commands: Commands) {
-    // We could use [`StateScoped`] on the sound playing entites instead.
-    // commands.trigger(PlaySoundtrack::Disable);
-}
-
 fn return_to_title_screen(mut next_screen: ResMut<NextState<Screen>>, mut commands: Commands) {
     commands.trigger(PlaySoundtrack::Key(SoundtrackKey::Menu));
     next_screen.set(Screen::Title);