From ce45bc622dfd54e3cf333541061b54a14ef10a74 Mon Sep 17 00:00:00 2001
From: luckyturtledev <git@lukas1818.de>
Date: Sat, 6 Jul 2024 17:27:29 +0200
Subject: [PATCH] fix some merge stuff

---
 src/activities/overworld.rs | 4 ++--
 src/main.rs                 | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/activities/overworld.rs b/src/activities/overworld.rs
index 6f530b1..185c66e 100644
--- a/src/activities/overworld.rs
+++ b/src/activities/overworld.rs
@@ -1,10 +1,10 @@
-use comfy::{draw_circle, vec2, EngineContext, GREEN};
+use comfy::{draw_circle, draw_sprite, vec2, EngineContext, Vec2, GREEN};
 
 use crate::game::ZLayer;
 
 pub mod worldgen;
 
-pub fn draw(state: &crate::State, _engine: &comfy::EngineContext) {
+pub fn draw(state: &crate::State, _engine: &comfy::EngineContext<'_>) {
 	draw_circle(vec2(0.0, 0.0), 0.5, GREEN, 0);
 	for (coords, tile) in state.overworld.iter_tiles() {
 		for (i, texture) in tile.textures.iter().rev().enumerate() {
diff --git a/src/main.rs b/src/main.rs
index b27adb0..c8c6b6a 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -1,6 +1,6 @@
-#[allow(dead_code, unused_variables)]
 #![warn(rust_2018_idioms)]
 #![forbid(clippy::wildcard_imports, elided_lifetimes_in_paths, unsafe_code)]
+#[allow(dead_code, unused_variables)]
 
 mod assets {
 	include!(env!("ASSETS_RS"));
@@ -13,7 +13,10 @@ use self::{
 	activities::{overworld::worldgen::Overworld, Activity},
 	assets::Assets
 };
-use comfy::{GameLoop, EngineState, EngineContext, GameConfig, init_game_config, run_comfy_main_async, pollster};
+use comfy::{
+	init_game_config, pollster, run_comfy_main_async, EngineContext, EngineState,
+	GameConfig, GameLoop
+};
 
 const GAME_NAME: &str = "Powercreep";