diff --git a/build.rs b/build.rs index 15a5cd1..edecaa2 100644 --- a/build.rs +++ b/build.rs @@ -122,16 +122,16 @@ impl AssetsWriter { writeln!(file, "{indent}impl Assets {{")?; writeln!( file, - "{indent}\tpub fn load(c: &mut comfy::EngineContext<'_>) {{" + "{indent}\tpub fn load(_ctx: &mut comfy::EngineContext<'_>) {{" )?; for asset_const_name in root.assets.values() { - writeln!(file, "{indent}\t\tc.load_texture_from_bytes({asset_const_name:?}, {asset_const_name});")?; + writeln!(file, "{indent}\t\t_ctx.load_texture_from_bytes({asset_const_name:?}, {asset_const_name});")?; } for asset_const_name in root.sound_assets.values() { writeln!(file, "{indent}\t\tcomfy::load_sound_from_bytes({asset_const_name:?}, {asset_const_name}, Default::default());")?; } for group_name in root.groups.keys() { - writeln!(file, "{indent}\t\t{group_name}::Assets::load(c);")?; + writeln!(file, "{indent}\t\t{group_name}::Assets::load(_ctx);")?; } writeln!(file, "{indent}\t}}")?; writeln!(file, "{indent}}}")?; diff --git a/src/activities/house/room.rs b/src/activities/house/room.rs index f25ae5d..42f7dd7 100644 --- a/src/activities/house/room.rs +++ b/src/activities/house/room.rs @@ -2,7 +2,7 @@ use super::{furniture::Furniture, grid::Grid}; use crate::game; use comfy::{ draw_rect, draw_rect_outline, draw_sprite, error, random_i32, vec2, EngineContext, - HashSet, Index, RandomRange as _, Vec2, GREEN, PURPLE, RED, WHITE + HashSet, RandomRange as _, Vec2, GREEN, PURPLE, RED, WHITE }; use indexmap::IndexSet; diff --git a/src/activities/overworld/mod.rs b/src/activities/overworld/mod.rs index 5060dfc..0068780 100644 --- a/src/activities/overworld/mod.rs +++ b/src/activities/overworld/mod.rs @@ -4,8 +4,8 @@ use crate::{ State }; use comfy::{ - draw_circle, draw_rect_outline, draw_sprite, error, info, is_key_down, - main_camera_mut, texture_id, vec2, EngineContext, IVec2, KeyCode, Vec2, RED, WHITE + draw_rect_outline, draw_sprite, error, info, is_key_down, main_camera_mut, + texture_id, vec2, EngineContext, IVec2, KeyCode, Vec2, RED, WHITE }; use std::time::Instant; use worldgen::MovementCost;