Merge branch 'main' into room-creation

src/activities/house/grid.rs

@@ -1,4 +1,4 @@
-use comfy::*;
+use comfy::{draw_circle, draw_line, error, vec2, Vec2, BLUE};
 
 #[derive(Debug)]
 pub struct Grid {

src/activities/house/mod.rs

@@ -13,7 +13,7 @@ pub struct HouseState {
 	player: Player
 }
 
-pub fn draw(state: &crate::State, _engine: &comfy::EngineContext) {
+pub fn draw(state: &crate::State, _engine: &comfy::EngineContext<'_>) {
 	//Draw House
 	state.house.room.draw();
 
@@ -24,6 +24,6 @@ pub fn draw(state: &crate::State, _engine: &comfy::EngineContext) {
 	state.house.player.draw();
 }
 
-pub fn update(state: &mut crate::State, _engine: &mut comfy::EngineContext) {
+pub fn update(state: &mut crate::State, _engine: &mut comfy::EngineContext<'_>) {
 	state.house.player.update(&state.house.room.grid);
 }

src/activities/house/player.rs

@@ -1,6 +1,6 @@
-use comfy::*;
-
 use super::Grid;
+use comfy::{delta, draw_circle, is_key_down, vec2, KeyCode, Vec2, RED};
+use std::collections::HashSet;
 
 #[derive(Debug)]
 pub struct Player {