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

@@ -10,7 +10,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 Grid
 	state.house.grid.draw();
 
@@ -18,6 +18,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.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 {

src/activities/overworld/mod.rs

@@ -1,6 +1,6 @@
 use comfy::{
-	draw_circle, draw_rect_outline, draw_sprite, main_camera_mut, texture_id, vec2,
+	draw_rect_outline, draw_sprite, main_camera_mut, EngineContext, IVec2, Vec2, RED,
-	EngineContext, IVec2, Vec2, GREEN, RED, WHITE
+	WHITE
 };
 
 use crate::game::ZLayer;

src/activities/overworld/worldgen.rs

@@ -1,3 +1,6 @@
+// TODO remove this
+#![allow(dead_code)]
+
 use crate::assets::ASSETS;
 use comfy::{IVec2, TextureHandle, UVec2};
 use log::info;