diff --git a/Cargo.toml b/Cargo.toml index 15de2ce..22b62ea 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -32,7 +32,7 @@ name = "doukutsu-rs" identifier = "io.github.doukutsu_rs" version = "0.101.0" resources = ["data"] -copyright = "Copyright (c) 2020-2022 doukutsu-rs contributors" +copyright = "Copyright (c) 2020-2023 doukutsu-rs contributors" category = "Game" osx_minimum_system_version = "10.12" diff --git a/src/editor/mod.rs b/src/editor/mod.rs index 9a02060..dbeb3ae 100644 --- a/src/editor/mod.rs +++ b/src/editor/mod.rs @@ -4,12 +4,16 @@ use std::rc::Rc; use imgui::{Image, MouseButton, Window, WindowFlags}; -use crate::{Context, GameResult, graphics, I_MAG, SharedGameState}; use crate::common::{Color, Rect}; use crate::components::background::Background; use crate::components::tilemap::{TileLayer, Tilemap}; +use crate::framework::context::Context; +use crate::framework::error::GameResult; +use crate::framework::graphics; +use crate::game::shared_game_state::SharedGameState; use crate::game::frame::Frame; use crate::game::stage::{Stage, StageTexturePaths}; +use crate::graphics::texture_set::I_MAG; #[derive(Copy, Clone, Eq, PartialEq)] pub enum CurrentTool { diff --git a/src/scene/editor_scene.rs b/src/scene/editor_scene.rs index ca04a34..d3d3e20 100644 --- a/src/scene/editor_scene.rs +++ b/src/scene/editor_scene.rs @@ -12,6 +12,8 @@ use crate::framework::keyboard::ScanCode; use crate::framework::ui::Components; use crate::game::shared_game_state::SharedGameState; use crate::game::stage::Stage; +use crate::graphics::font::Font; +use crate::scene::Scene; use crate::scene::game_scene::GameScene; use crate::scene::title_scene::TitleScene; @@ -189,7 +191,8 @@ impl Scene for EditorScene { ctx, &state.constants, &mut state.texture_set, - ); + )?; + return Ok(()); }