fix some merge stuff

This commit is contained in:
luckyturtledev 2024-07-06 17:27:29 +02:00
parent 284163b428
commit ce45bc622d
2 changed files with 7 additions and 4 deletions

View file

@ -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() {