diff --git a/src/activities/house/mod.rs b/src/activities/house/mod.rs index 555d631..7d43dc3 100644 --- a/src/activities/house/mod.rs +++ b/src/activities/house/mod.rs @@ -4,7 +4,6 @@ mod player; mod room; use self::{grid::Grid, player::Player, room::Room}; -use super::Activity; use crate::State; use comfy::{error, EngineContext}; diff --git a/src/activities/house/room.rs b/src/activities/house/room.rs index 87cb84b..e3cecb8 100644 --- a/src/activities/house/room.rs +++ b/src/activities/house/room.rs @@ -27,7 +27,7 @@ struct Tile { #[derive(Debug)] pub struct Room { - room_type: RoomType, + _room_type: RoomType, pub size: (u8, u8), //(width, height) pub grid: Grid, furnitures: Vec @@ -54,7 +54,7 @@ impl Room { let furnitures = Self::random_room_furniture(&room_type, size, ctx); Room { - room_type, + _room_type: room_type, size, grid: Self::create_grid(size.0, size.1), furnitures @@ -80,7 +80,6 @@ impl Room { let mut furnitures = Vec::new(); let mut empty_spots: IndexSet = (0 .. width).collect(); - let mut assets_used: HashSet<&'static str> = HashSet::new(); fn random_empty_spot(empty_spots: &mut IndexSet) -> Option { if empty_spots.is_empty() { diff --git a/src/activities/overworld/mod.rs b/src/activities/overworld/mod.rs index d2dd96a..90ea09f 100644 --- a/src/activities/overworld/mod.rs +++ b/src/activities/overworld/mod.rs @@ -1,11 +1,4 @@ -use crate::{ - activities::{ - house::{self, HouseState}, - Activity - }, - game::ZLayer, - State -}; +use crate::{activities::Activity, game::ZLayer, State}; use comfy::{ draw_circle, draw_rect_outline, draw_sprite, error, info, is_key_down, main_camera_mut, EngineContext, IVec2, KeyCode, Vec2, RED, WHITE diff --git a/src/game.rs b/src/game.rs index 3a3a920..b39886c 100644 --- a/src/game.rs +++ b/src/game.rs @@ -86,7 +86,7 @@ impl Sub for ZLayer { } } -pub fn setup(state: &mut State, ctx: &mut EngineContext<'_>) { +pub fn setup(_state: &mut State, ctx: &mut EngineContext<'_>) { Assets::load(ctx); }