diff --git a/src/components.rs b/src/components.rs index 9969f6b..58afb4f 100644 --- a/src/components.rs +++ b/src/components.rs @@ -1,9 +1,9 @@ -use rltk::{Point, RGB}; -use serde::{Deserialize, Serialize}; -use specs::error::NoError; -use specs::prelude::*; -use specs::saveload::{ConvertSaveload, Marker}; -use specs_derive::*; +use ::rltk::{Point, RGB}; +use ::serde::{Deserialize, Serialize}; +use ::specs::error::NoError; +use ::specs::prelude::*; +use ::specs::saveload::{ConvertSaveload, Marker}; +use ::specs_derive::*; #[derive(Component, ConvertSaveload, Default, Copy, Clone)] pub struct Position { diff --git a/src/damage_system.rs b/src/damage_system.rs index b8895a8..548b8a6 100644 --- a/src/damage_system.rs +++ b/src/damage_system.rs @@ -1,4 +1,4 @@ -use specs::prelude::*; +use ::specs::prelude::*; use crate::components::{CombatStats, Name, Player, SufferDamage}; use crate::game_log::GameLog; diff --git a/src/gui.rs b/src/gui.rs index 2434ae4..da260da 100644 --- a/src/gui.rs +++ b/src/gui.rs @@ -1,5 +1,5 @@ -use rltk::{Point, Rltk, VirtualKeyCode, RGB}; -use specs::prelude::*; +use ::rltk::{Point, Rltk, VirtualKeyCode, RGB}; +use ::specs::prelude::*; use crate::components::{ CombatStats, HungerClock, HungerState, InBackpack, Name, Player, Position, Viewshed, diff --git a/src/hunger_system.rs b/src/hunger_system.rs index 0eebdb5..da035db 100644 --- a/src/hunger_system.rs +++ b/src/hunger_system.rs @@ -1,4 +1,4 @@ -use specs::prelude::*; +use ::specs::prelude::*; use crate::components::{HungerClock, HungerState, SufferDamage}; use crate::game_log::GameLog; diff --git a/src/inventory_system.rs b/src/inventory_system.rs index 9ef3e94..1df1097 100644 --- a/src/inventory_system.rs +++ b/src/inventory_system.rs @@ -1,5 +1,5 @@ -use rltk::RGB; -use specs::prelude::*; +use ::rltk::RGB; +use ::specs::prelude::*; use crate::components::*; use crate::game_log::GameLog; diff --git a/src/main.rs b/src/main.rs index f3990e4..99b2661 100644 --- a/src/main.rs +++ b/src/main.rs @@ -50,7 +50,7 @@ macro_rules! register { } } -const SHOW_MAPGEN_VISUALIZER: bool = false; +const SHOW_MAPGEN_VISUALIZER: bool = true; #[derive(PartialEq, Copy, Clone)] pub enum RunState { @@ -485,10 +485,8 @@ impl State { } } -fn main() -> rltk::BError { - use rltk::RltkBuilder; - - let context = RltkBuilder::simple80x50() +fn main() -> ::rltk::BError { + let context = ::rltk::RltkBuilder::simple80x50() .with_title("Roguelike Tutorial") .build()?; @@ -542,7 +540,7 @@ fn main() -> rltk::BError { gs.ecs.insert(Map::new(1, 64, 64)); gs.ecs.insert(Point::zero()); - gs.ecs.insert(rltk::RandomNumberGenerator::new()); + gs.ecs.insert(RandomNumberGenerator::new()); let player_entity = spawner::player(&mut gs.ecs, 0, 0); gs.ecs.insert(player_entity); diff --git a/src/map/tiletype.rs b/src/map/tiletype.rs index 41fc8e5..c71852e 100644 --- a/src/map/tiletype.rs +++ b/src/map/tiletype.rs @@ -1,4 +1,4 @@ -use serde::{Deserialize, Serialize}; +use ::serde::{Deserialize, Serialize}; #[derive(PartialEq, Eq, Hash, Copy, Clone, Serialize, Deserialize)] pub enum TileType { diff --git a/src/map_builders.rs b/src/map_builders.rs index 308f3b0..bd47b4d 100644 --- a/src/map_builders.rs +++ b/src/map_builders.rs @@ -29,6 +29,7 @@ mod voronoi_spawning; mod waveform_collapse; use ::rltk::RandomNumberGenerator; +use ::specs::prelude::*; use area_starting_points::{AreaStartingPosition, XStart, YStart}; use bsp_dungeon::BspDungeonBuilder; use bsp_interior::BspInteriorBuilder; @@ -53,7 +54,6 @@ use rooms_corridors_dogleg::DoglegCorridors; use rooms_corridors_lines::StraightLineCorridors; use rooms_corridors_nearest::NearestCorridors; use simple_map::SimpleMapBuilder; -use specs::prelude::*; use town::town_builder; use voronoi::VoronoiCellBuilder; use voronoi_spawning::VoronoiSpawning; diff --git a/src/map_builders/area_starting_points.rs b/src/map_builders/area_starting_points.rs index 4c43c0a..e832655 100644 --- a/src/map_builders/area_starting_points.rs +++ b/src/map_builders/area_starting_points.rs @@ -1,4 +1,4 @@ -use rltk::RandomNumberGenerator; +use ::rltk::RandomNumberGenerator; use crate::map_builders::{BuilderMap, MetaMapBuilder}; use crate::{map, Position}; diff --git a/src/map_builders/bsp_dungeon.rs b/src/map_builders/bsp_dungeon.rs index bed53e5..05a7212 100644 --- a/src/map_builders/bsp_dungeon.rs +++ b/src/map_builders/bsp_dungeon.rs @@ -1,4 +1,4 @@ -use rltk::RandomNumberGenerator; +use ::rltk::RandomNumberGenerator; use crate::map_builders::{BuilderMap, InitialMapBuilder}; use crate::{Rect, TileType}; diff --git a/src/map_builders/bsp_interior.rs b/src/map_builders/bsp_interior.rs index 23050c0..9db6689 100644 --- a/src/map_builders/bsp_interior.rs +++ b/src/map_builders/bsp_interior.rs @@ -1,4 +1,4 @@ -use rltk::RandomNumberGenerator; +use ::rltk::RandomNumberGenerator; use crate::map_builders::common::draw_corridor; use crate::map_builders::{BuilderMap, InitialMapBuilder}; diff --git a/src/map_builders/cellular_automata.rs b/src/map_builders/cellular_automata.rs index af3b9bb..88ced9b 100644 --- a/src/map_builders/cellular_automata.rs +++ b/src/map_builders/cellular_automata.rs @@ -1,4 +1,4 @@ -use rltk::RandomNumberGenerator; +use ::rltk::RandomNumberGenerator; use crate::map_builders::{BuilderMap, InitialMapBuilder, MetaMapBuilder}; use crate::TileType; diff --git a/src/map_builders/cull_unreachable.rs b/src/map_builders/cull_unreachable.rs index 652db85..85d7656 100644 --- a/src/map_builders/cull_unreachable.rs +++ b/src/map_builders/cull_unreachable.rs @@ -1,4 +1,4 @@ -use rltk::RandomNumberGenerator; +use ::rltk::RandomNumberGenerator; use crate::map_builders::{BuilderMap, MetaMapBuilder}; use crate::TileType; diff --git a/src/map_builders/distant_exit.rs b/src/map_builders/distant_exit.rs index 00d9ae0..915b416 100644 --- a/src/map_builders/distant_exit.rs +++ b/src/map_builders/distant_exit.rs @@ -1,4 +1,4 @@ -use rltk::RandomNumberGenerator; +use ::rltk::RandomNumberGenerator; use crate::map_builders::{BuilderMap, MetaMapBuilder}; use crate::TileType; diff --git a/src/map_builders/dla.rs b/src/map_builders/dla.rs index 4e33b1b..e385d0c 100644 --- a/src/map_builders/dla.rs +++ b/src/map_builders/dla.rs @@ -1,4 +1,4 @@ -use rltk::RandomNumberGenerator; +use ::rltk::RandomNumberGenerator; use super::common::{paint, Symmetry}; use crate::components::Position; diff --git a/src/map_builders/door_placement.rs b/src/map_builders/door_placement.rs index 43f2580..e0f394d 100644 --- a/src/map_builders/door_placement.rs +++ b/src/map_builders/door_placement.rs @@ -1,4 +1,4 @@ -use rltk::RandomNumberGenerator; +use ::rltk::RandomNumberGenerator; use super::{BuilderMap, MetaMapBuilder}; use crate::TileType; diff --git a/src/map_builders/drunkard.rs b/src/map_builders/drunkard.rs index fa1b58c..566d719 100644 --- a/src/map_builders/drunkard.rs +++ b/src/map_builders/drunkard.rs @@ -1,4 +1,4 @@ -use rltk::RandomNumberGenerator; +use ::rltk::RandomNumberGenerator; use super::common::{paint, Symmetry}; use crate::components::Position; diff --git a/src/map_builders/maze.rs b/src/map_builders/maze.rs index 9b38529..f12fcbe 100644 --- a/src/map_builders/maze.rs +++ b/src/map_builders/maze.rs @@ -1,6 +1,6 @@ use std::cmp::{max, min}; -use rltk::RandomNumberGenerator; +use ::rltk::RandomNumberGenerator; use crate::map_builders::{BuilderMap, InitialMapBuilder}; use crate::{Map, TileType}; diff --git a/src/map_builders/prefab_builder.rs b/src/map_builders/prefab_builder.rs index 47b241b..f12f16b 100644 --- a/src/map_builders/prefab_builder.rs +++ b/src/map_builders/prefab_builder.rs @@ -4,7 +4,7 @@ pub mod prefab_sections; use std::collections::HashSet; -use rltk::RandomNumberGenerator; +use ::rltk::RandomNumberGenerator; use crate::map_builders::{BuilderMap, InitialMapBuilder, MetaMapBuilder}; use crate::{Position, TileType}; diff --git a/src/map_builders/room_based_spawner.rs b/src/map_builders/room_based_spawner.rs index ba6086f..1c2700b 100644 --- a/src/map_builders/room_based_spawner.rs +++ b/src/map_builders/room_based_spawner.rs @@ -1,4 +1,4 @@ -use rltk::RandomNumberGenerator; +use ::rltk::RandomNumberGenerator; use crate::map_builders::{spawner, BuilderMap, MetaMapBuilder}; diff --git a/src/map_builders/room_based_stairs.rs b/src/map_builders/room_based_stairs.rs index 7143e26..73fb200 100644 --- a/src/map_builders/room_based_stairs.rs +++ b/src/map_builders/room_based_stairs.rs @@ -1,4 +1,4 @@ -use rltk::RandomNumberGenerator; +use ::rltk::RandomNumberGenerator; use crate::map_builders::{BuilderMap, MetaMapBuilder}; use crate::TileType; diff --git a/src/map_builders/room_based_starting_position.rs b/src/map_builders/room_based_starting_position.rs index 2a14a8c..e70ee96 100644 --- a/src/map_builders/room_based_starting_position.rs +++ b/src/map_builders/room_based_starting_position.rs @@ -1,4 +1,4 @@ -use rltk::RandomNumberGenerator; +use ::rltk::RandomNumberGenerator; use crate::map_builders::{BuilderMap, MetaMapBuilder}; use crate::Position; diff --git a/src/map_builders/room_corner_rounding.rs b/src/map_builders/room_corner_rounding.rs index 3a21a9b..6574886 100644 --- a/src/map_builders/room_corner_rounding.rs +++ b/src/map_builders/room_corner_rounding.rs @@ -1,4 +1,4 @@ -use rltk::RandomNumberGenerator; +use ::rltk::RandomNumberGenerator; use crate::map_builders::{BuilderMap, MetaMapBuilder}; use crate::{Rect, TileType}; diff --git a/src/map_builders/room_corridor_spawner.rs b/src/map_builders/room_corridor_spawner.rs index 4eda8c9..153596b 100644 --- a/src/map_builders/room_corridor_spawner.rs +++ b/src/map_builders/room_corridor_spawner.rs @@ -1,4 +1,4 @@ -use rltk::RandomNumberGenerator; +use ::rltk::RandomNumberGenerator; use super::{BuilderMap, MetaMapBuilder}; use crate::spawner; diff --git a/src/map_builders/room_draw.rs b/src/map_builders/room_draw.rs index c5498a0..b7ecc5f 100644 --- a/src/map_builders/room_draw.rs +++ b/src/map_builders/room_draw.rs @@ -1,4 +1,4 @@ -use rltk::RandomNumberGenerator; +use ::rltk::RandomNumberGenerator; use super::{BuilderMap, MetaMapBuilder}; use crate::{Rect, TileType}; diff --git a/src/map_builders/room_exploder.rs b/src/map_builders/room_exploder.rs index 43819ed..dec34ee 100644 --- a/src/map_builders/room_exploder.rs +++ b/src/map_builders/room_exploder.rs @@ -1,4 +1,4 @@ -use rltk::RandomNumberGenerator; +use ::rltk::RandomNumberGenerator; use crate::map_builders::common::{paint, Symmetry}; use crate::map_builders::{BuilderMap, MetaMapBuilder}; diff --git a/src/map_builders/room_sorter.rs b/src/map_builders/room_sorter.rs index 3437290..f7eb477 100644 --- a/src/map_builders/room_sorter.rs +++ b/src/map_builders/room_sorter.rs @@ -1,4 +1,4 @@ -use rltk::RandomNumberGenerator; +use ::rltk::RandomNumberGenerator; use super::{BuilderMap, MetaMapBuilder}; use crate::Rect; diff --git a/src/map_builders/rooms_corridors_bsp.rs b/src/map_builders/rooms_corridors_bsp.rs index 4a4d7a6..51659f4 100644 --- a/src/map_builders/rooms_corridors_bsp.rs +++ b/src/map_builders/rooms_corridors_bsp.rs @@ -1,4 +1,4 @@ -use rltk::RandomNumberGenerator; +use ::rltk::RandomNumberGenerator; use super::common::draw_corridor; use super::{BuilderMap, MetaMapBuilder}; diff --git a/src/map_builders/rooms_corridors_dogleg.rs b/src/map_builders/rooms_corridors_dogleg.rs index 293c23a..504338e 100644 --- a/src/map_builders/rooms_corridors_dogleg.rs +++ b/src/map_builders/rooms_corridors_dogleg.rs @@ -1,4 +1,4 @@ -use rltk::RandomNumberGenerator; +use ::rltk::RandomNumberGenerator; use super::common::{apply_horizontal_tunnel, apply_vertical_tunnel}; use crate::map_builders::{BuilderMap, MetaMapBuilder}; diff --git a/src/map_builders/rooms_corridors_lines.rs b/src/map_builders/rooms_corridors_lines.rs index ae123b4..a748e3a 100644 --- a/src/map_builders/rooms_corridors_lines.rs +++ b/src/map_builders/rooms_corridors_lines.rs @@ -1,6 +1,6 @@ use std::collections::HashSet; -use rltk::RandomNumberGenerator; +use ::rltk::RandomNumberGenerator; use super::{BuilderMap, MetaMapBuilder}; use crate::{Rect, TileType}; diff --git a/src/map_builders/rooms_corridors_nearest.rs b/src/map_builders/rooms_corridors_nearest.rs index 42eeda3..b1af41b 100644 --- a/src/map_builders/rooms_corridors_nearest.rs +++ b/src/map_builders/rooms_corridors_nearest.rs @@ -1,6 +1,6 @@ use std::collections::HashSet; -use rltk::RandomNumberGenerator; +use ::rltk::RandomNumberGenerator; use super::common::draw_corridor; use super::{BuilderMap, MetaMapBuilder}; diff --git a/src/map_builders/simple_map.rs b/src/map_builders/simple_map.rs index 590aa1e..ebd6764 100644 --- a/src/map_builders/simple_map.rs +++ b/src/map_builders/simple_map.rs @@ -1,4 +1,4 @@ -use rltk::RandomNumberGenerator; +use ::rltk::RandomNumberGenerator; use crate::map_builders::{BuilderMap, InitialMapBuilder}; use crate::Rect; diff --git a/src/map_builders/town.rs b/src/map_builders/town.rs index b7157a8..f7cf060 100644 --- a/src/map_builders/town.rs +++ b/src/map_builders/town.rs @@ -1,4 +1,4 @@ -use rltk::RandomNumberGenerator; +use ::rltk::RandomNumberGenerator; use super::{BuilderChain, BuilderMap, InitialMapBuilder}; use crate::map_builders::area_starting_points::AreaStartingPosition; diff --git a/src/map_builders/voronoi.rs b/src/map_builders/voronoi.rs index 91af8e1..06e25b4 100644 --- a/src/map_builders/voronoi.rs +++ b/src/map_builders/voronoi.rs @@ -1,4 +1,4 @@ -use rltk::RandomNumberGenerator; +use ::rltk::RandomNumberGenerator; use crate::map_builders::{BuilderMap, InitialMapBuilder}; use crate::TileType; diff --git a/src/map_builders/voronoi_spawning.rs b/src/map_builders/voronoi_spawning.rs index 8cb6597..65b18bb 100644 --- a/src/map_builders/voronoi_spawning.rs +++ b/src/map_builders/voronoi_spawning.rs @@ -1,6 +1,6 @@ use std::collections::HashMap; -use rltk::RandomNumberGenerator; +use ::rltk::RandomNumberGenerator; use crate::map_builders::{BuilderMap, MetaMapBuilder}; use crate::{spawner, TileType}; diff --git a/src/map_builders/waveform_collapse.rs b/src/map_builders/waveform_collapse.rs index 65812b0..b576e4c 100644 --- a/src/map_builders/waveform_collapse.rs +++ b/src/map_builders/waveform_collapse.rs @@ -2,9 +2,9 @@ mod common; mod constraints; mod solver; +use ::rltk::RandomNumberGenerator; use common::*; use constraints::*; -use rltk::RandomNumberGenerator; use solver::*; use crate::map_builders::{BuilderMap, MetaMapBuilder}; diff --git a/src/map_indexing_system.rs b/src/map_indexing_system.rs index ea61458..a42d7dd 100644 --- a/src/map_indexing_system.rs +++ b/src/map_indexing_system.rs @@ -1,4 +1,4 @@ -use specs::prelude::*; +use ::specs::prelude::*; use crate::{BlocksTile, Map, Position}; diff --git a/src/melee_combat_system.rs b/src/melee_combat_system.rs index a81d383..326de17 100644 --- a/src/melee_combat_system.rs +++ b/src/melee_combat_system.rs @@ -1,5 +1,5 @@ -use rltk::RGB; -use specs::prelude::*; +use ::rltk::RGB; +use ::specs::prelude::*; use crate::components::{ CombatStats, DefenseBonus, Equipped, HungerClock, HungerState, MeleePowerBonus, Name, diff --git a/src/monster_ai_system.rs b/src/monster_ai_system.rs index 337d105..23e077c 100644 --- a/src/monster_ai_system.rs +++ b/src/monster_ai_system.rs @@ -1,5 +1,5 @@ -use rltk::{Point, RGB}; -use specs::prelude::*; +use ::rltk::{Point, RGB}; +use ::specs::prelude::*; use crate::components::{Confusion, Monster, Position, Viewshed, WantsToMelee}; use crate::particle_system::ParticleBuilder; diff --git a/src/particle_system.rs b/src/particle_system.rs index d14de7a..53cefbd 100644 --- a/src/particle_system.rs +++ b/src/particle_system.rs @@ -1,5 +1,5 @@ -use rltk::{Rltk, RGB}; -use specs::prelude::*; +use ::rltk::{Rltk, RGB}; +use ::specs::prelude::*; use crate::components::{ParticleLifetime, Renderable}; use crate::Position; diff --git a/src/player.rs b/src/player.rs index 11130c5..0bbefd0 100644 --- a/src/player.rs +++ b/src/player.rs @@ -1,7 +1,7 @@ use std::cmp::{max, min}; -use rltk::{Point, Rltk, VirtualKeyCode}; -use specs::prelude::*; +use ::rltk::{Point, Rltk, VirtualKeyCode}; +use ::specs::prelude::*; use crate::components::{ BlocksTile, BlocksVisibility, CombatStats, Door, EntityMoved, HungerClock, HungerState, Item, diff --git a/src/random_table.rs b/src/random_table.rs index e7a7cd8..4f536f2 100644 --- a/src/random_table.rs +++ b/src/random_table.rs @@ -1,4 +1,4 @@ -use rltk::RandomNumberGenerator; +use ::rltk::RandomNumberGenerator; pub struct RandomEntry { name: String, diff --git a/src/raws.rs b/src/raws.rs index f567cc3..648fa7c 100644 --- a/src/raws.rs +++ b/src/raws.rs @@ -6,11 +6,12 @@ mod spawn_table_structs; use std::sync::Mutex; +use ::rltk::{embedded_resource, link_resource}; +use ::serde::Deserialize; use item_structs::*; use mob_structs::*; use prop_structs::*; pub use rawmaster::*; -use serde::Deserialize; use spawn_table_structs::*; #[derive(Deserialize, Debug)] @@ -21,23 +22,23 @@ pub struct Raws { pub spawn_table: Vec, } -rltk::embedded_resource!(RAW_FILE, "../raws/spawns.json"); +embedded_resource!(RAW_FILE, "../raws/spawns.json"); lazy_static! { pub static ref RAWS: Mutex = Mutex::new(RawMaster::empty()); } pub fn load_raws() { - rltk::link_resource!(RAW_FILE, "../raws/spawns.json"); + link_resource!(RAW_FILE, "../raws/spawns.json"); - let raw_data = rltk::embedding::EMBED + let raw_data = ::rltk::embedding::EMBED .lock() .get_resource("../raws/spawns.json".to_string()) .unwrap(); let raw_string = std::str::from_utf8(raw_data).expect("Unable to convert to a valid UTF-8 string."); - let decoder: Raws = serde_json::from_str(raw_string).expect("Unable to parse JSON"); + let decoder: Raws = ::serde_json::from_str(raw_string).expect("Unable to parse JSON"); RAWS.lock().unwrap().load(decoder); } diff --git a/src/raws/item_structs.rs b/src/raws/item_structs.rs index c5c559e..8b9c1b3 100644 --- a/src/raws/item_structs.rs +++ b/src/raws/item_structs.rs @@ -1,6 +1,6 @@ use std::collections::HashMap; -use serde::Deserialize; +use ::serde::Deserialize; #[derive(Deserialize, Debug)] pub struct Item { diff --git a/src/raws/mob_structs.rs b/src/raws/mob_structs.rs index 9a6bee9..61a570e 100644 --- a/src/raws/mob_structs.rs +++ b/src/raws/mob_structs.rs @@ -1,4 +1,4 @@ -use serde::Deserialize; +use ::serde::Deserialize; use super::item_structs::Renderable; diff --git a/src/raws/prop_structs.rs b/src/raws/prop_structs.rs index 54b10ac..da8ba30 100644 --- a/src/raws/prop_structs.rs +++ b/src/raws/prop_structs.rs @@ -1,6 +1,6 @@ use std::collections::HashMap; -use serde::Deserialize; +use ::serde::Deserialize; use super::Renderable; diff --git a/src/raws/rawmaster.rs b/src/raws/rawmaster.rs index a925595..53f424e 100644 --- a/src/raws/rawmaster.rs +++ b/src/raws/rawmaster.rs @@ -1,6 +1,6 @@ use std::collections::{HashMap, HashSet}; -use specs::prelude::*; +use ::specs::prelude::*; use crate::components::*; use crate::random_table::RandomTable; diff --git a/src/raws/spawn_table_structs.rs b/src/raws/spawn_table_structs.rs index 40102b6..f19dc99 100644 --- a/src/raws/spawn_table_structs.rs +++ b/src/raws/spawn_table_structs.rs @@ -1,4 +1,4 @@ -use serde::Deserialize; +use ::serde::Deserialize; #[derive(Deserialize, Debug)] pub struct SpawnTableEntry { diff --git a/src/rect.rs b/src/rect.rs index 416178e..efe31cb 100644 --- a/src/rect.rs +++ b/src/rect.rs @@ -1,4 +1,4 @@ -use serde::{Deserialize, Serialize}; +use ::serde::{Deserialize, Serialize}; #[derive(PartialEq, Copy, Clone, Serialize, Deserialize)] pub struct Rect { diff --git a/src/rex_assets.rs b/src/rex_assets.rs index 7bdfb95..1a5a06b 100644 --- a/src/rex_assets.rs +++ b/src/rex_assets.rs @@ -1,8 +1,9 @@ -use rltk::rex::XpFile; +use ::rltk::rex::XpFile; +use ::rltk::{embedded_resource, link_resource}; -rltk::embedded_resource!(SMALL_DUNGEON, "../resources/SmallDungeon_80x50.xp"); -rltk::embedded_resource!(WFC_DEMO_IMAGE1, "../resources/wfc-demo1.xp"); -rltk::embedded_resource!(WFC_POPULATED, "../resources/wfc-populated.xp"); +embedded_resource!(SMALL_DUNGEON, "../resources/SmallDungeon_80x50.xp"); +embedded_resource!(WFC_DEMO_IMAGE1, "../resources/wfc-demo1.xp"); +embedded_resource!(WFC_POPULATED, "../resources/wfc-populated.xp"); pub struct RexAssets { pub menu: XpFile, @@ -10,9 +11,9 @@ pub struct RexAssets { impl RexAssets { pub fn new() -> RexAssets { - rltk::link_resource!(SMALL_DUNGEON, "../resources/SmallDungeon_80x50.xp"); - rltk::link_resource!(WFC_DEMO_IMAGE1, "../resources/wfc-demo1.xp"); - rltk::link_resource!(WFC_POPULATED, "../resources/wfc-populated.xp"); + link_resource!(SMALL_DUNGEON, "../resources/SmallDungeon_80x50.xp"); + link_resource!(WFC_DEMO_IMAGE1, "../resources/wfc-demo1.xp"); + link_resource!(WFC_POPULATED, "../resources/wfc-populated.xp"); RexAssets { menu: XpFile::from_resource("../resources/SmallDungeon_80x50.xp").unwrap(), diff --git a/src/saveload_system.rs b/src/saveload_system.rs index 946295a..d57db50 100644 --- a/src/saveload_system.rs +++ b/src/saveload_system.rs @@ -2,13 +2,15 @@ use std::fs; use std::fs::File; use std::path::Path; -use specs::error::NoError; -use specs::prelude::*; -use specs::saveload::{ +use ::rltk::Point; +use ::specs::error::NoError; +use ::specs::prelude::*; +use ::specs::saveload::{ DeserializeComponents, MarkedBuilder, SerializeComponents, SimpleMarker, SimpleMarkerAllocator, }; use crate::components::*; +use crate::map::Map; macro_rules! serialize_individually { ($ecs:expr, $ser:expr, $data:expr, $( $type:ty),*,) => { @@ -30,7 +32,7 @@ pub fn save_game(_ecs: &mut World) {} #[cfg(not(target_arch = "wasm32"))] pub fn save_game(ecs: &mut World) { // Create helper - let mapcopy = ecs.get_mut::().unwrap().clone(); + let mapcopy = ecs.get_mut::().unwrap().clone(); let savehelper = ecs .create_entity() .with(SerializationHelper { map: mapcopy }) @@ -45,7 +47,7 @@ pub fn save_game(ecs: &mut World) { ); let writer = File::create("./savegame.json").unwrap(); - let mut serializer = serde_json::Serializer::new(writer); + let mut serializer = ::serde_json::Serializer::new(writer); serialize_individually!( ecs, serializer, @@ -128,7 +130,7 @@ pub fn load_game(ecs: &mut World) { } let data = fs::read_to_string("./savegame.json").unwrap(); - let mut de = serde_json::Deserializer::from_str(&data); + let mut de = ::serde_json::Deserializer::from_str(&data); { let mut d = ( @@ -189,15 +191,15 @@ pub fn load_game(ecs: &mut World) { let position = ecs.read_storage::(); for (e, h) in (&entities, &helper).join() { - let mut worldmap = ecs.write_resource::(); + let mut worldmap = ecs.write_resource::(); *worldmap = h.map.clone(); worldmap.tile_content = vec![Vec::new(); (worldmap.height * worldmap.width) as usize]; deleteme = Some(e); } for (e, _p, pos) in (&entities, &player, &position).join() { - let mut ppos = ecs.write_resource::(); - *ppos = rltk::Point::new(pos.x, pos.y); + let mut ppos = ecs.write_resource::(); + *ppos = Point::new(pos.x, pos.y); let mut player_resource = ecs.write_resource::(); *player_resource = e; diff --git a/src/spawner.rs b/src/spawner.rs index 67f329e..651dedb 100644 --- a/src/spawner.rs +++ b/src/spawner.rs @@ -1,8 +1,8 @@ use std::collections::HashMap; -use rltk::{RandomNumberGenerator, RGB}; -use specs::prelude::*; -use specs::saveload::{MarkedBuilder, SimpleMarker}; +use ::rltk::{RandomNumberGenerator, RGB}; +use ::specs::prelude::*; +use ::specs::saveload::{MarkedBuilder, SimpleMarker}; use crate::components::*; use crate::random_table::RandomTable; diff --git a/src/trigger_system.rs b/src/trigger_system.rs index 67e4b67..0c7dc20 100644 --- a/src/trigger_system.rs +++ b/src/trigger_system.rs @@ -1,4 +1,4 @@ -use specs::prelude::*; +use ::specs::prelude::*; use crate::components::{ EntityMoved, EntryTrigger, Hidden, InflictsDamage, Name, Position, SingleActivation, diff --git a/src/visibility_system.rs b/src/visibility_system.rs index 51b413f..c7b3e77 100644 --- a/src/visibility_system.rs +++ b/src/visibility_system.rs @@ -1,5 +1,5 @@ -use rltk::{field_of_view, Point, RandomNumberGenerator}; -use specs::prelude::*; +use ::rltk::{field_of_view, Point, RandomNumberGenerator}; +use ::specs::prelude::*; use crate::components::{BlocksVisibility, Hidden, Name}; use crate::game_log::GameLog;