From 99d5a7851219e3647929955cf4cddd450dc4182a Mon Sep 17 00:00:00 2001 From: Timothy Warren Date: Tue, 14 Dec 2021 14:15:22 -0500 Subject: [PATCH] Fix some linting issues --- src/map_builders/bsp_dungeon.rs | 1 - src/map_builders/bsp_interior.rs | 1 - src/map_builders/cellular_automata.rs | 1 - src/map_builders/dla.rs | 1 - src/map_builders/drunkard.rs | 1 - src/map_builders/maze.rs | 12 +++++++++++- src/map_builders/prefab_builder.rs | 5 ++--- src/map_builders/simple_map.rs | 1 - src/map_builders/voronoi.rs | 1 - src/map_builders/waveform_collapse.rs | 1 - src/spawner.rs | 2 +- 11 files changed, 14 insertions(+), 13 deletions(-) diff --git a/src/map_builders/bsp_dungeon.rs b/src/map_builders/bsp_dungeon.rs index 29ff6bb..11bfd26 100644 --- a/src/map_builders/bsp_dungeon.rs +++ b/src/map_builders/bsp_dungeon.rs @@ -1,5 +1,4 @@ use rltk::RandomNumberGenerator; -use specs::prelude::*; use super::MapBuilder; use crate::components::Position; diff --git a/src/map_builders/bsp_interior.rs b/src/map_builders/bsp_interior.rs index 452ad0a..27393bd 100644 --- a/src/map_builders/bsp_interior.rs +++ b/src/map_builders/bsp_interior.rs @@ -1,5 +1,4 @@ use rltk::RandomNumberGenerator; -use specs::prelude::*; use super::MapBuilder; use crate::components::Position; diff --git a/src/map_builders/cellular_automata.rs b/src/map_builders/cellular_automata.rs index 370611f..52b63d0 100644 --- a/src/map_builders/cellular_automata.rs +++ b/src/map_builders/cellular_automata.rs @@ -1,7 +1,6 @@ use std::collections::HashMap; use rltk::RandomNumberGenerator; -use specs::prelude::*; use super::common::{ generate_voronoi_spawn_regions, remove_unreachable_areas_returning_most_distant, diff --git a/src/map_builders/dla.rs b/src/map_builders/dla.rs index 4f860b9..d5036c2 100644 --- a/src/map_builders/dla.rs +++ b/src/map_builders/dla.rs @@ -1,7 +1,6 @@ use std::collections::HashMap; use rltk::RandomNumberGenerator; -use specs::prelude::*; use super::common::{ generate_voronoi_spawn_regions, paint, remove_unreachable_areas_returning_most_distant, diff --git a/src/map_builders/drunkard.rs b/src/map_builders/drunkard.rs index 071ae17..9fe4bf2 100644 --- a/src/map_builders/drunkard.rs +++ b/src/map_builders/drunkard.rs @@ -1,7 +1,6 @@ use std::collections::HashMap; use rltk::RandomNumberGenerator; -use specs::prelude::*; use super::common::{ generate_voronoi_spawn_regions, paint, remove_unreachable_areas_returning_most_distant, diff --git a/src/map_builders/maze.rs b/src/map_builders/maze.rs index fd917ca..e08d447 100644 --- a/src/map_builders/maze.rs +++ b/src/map_builders/maze.rs @@ -2,7 +2,6 @@ use std::cmp::{max, min}; use std::collections::HashMap; use rltk::RandomNumberGenerator; -use specs::prelude::*; use super::{ generate_voronoi_spawn_regions, remove_unreachable_areas_returning_most_distant, MapBuilder, @@ -90,6 +89,17 @@ impl MazeBuilder { // Now we build a noise map for use in spawning entities later self.noise_areas = generate_voronoi_spawn_regions(&self.map, &mut rng); + + // Spawn the entities + for area in self.noise_areas.iter() { + spawner::spawn_region( + &self.map, + &mut rng, + area.1, + self.depth, + &mut self.spawn_list, + ); + } } } diff --git a/src/map_builders/prefab_builder.rs b/src/map_builders/prefab_builder.rs index 58b4863..2395878 100644 --- a/src/map_builders/prefab_builder.rs +++ b/src/map_builders/prefab_builder.rs @@ -5,7 +5,6 @@ pub mod prefab_sections; use std::collections::HashSet; use rltk::RandomNumberGenerator; -use specs::prelude::*; use super::{remove_unreachable_areas_returning_most_distant, MapBuilder}; use crate::{spawner, Map, Position, TileType, SHOW_MAPGEN_VISUALIZER}; @@ -140,7 +139,7 @@ impl PrefabBuilder { fn build(&mut self) { match self.mode { - PrefabMode::RexLevel { template } => self.load_rex_map(&template), + PrefabMode::RexLevel { template } => self.load_rex_map(template), PrefabMode::Constant { level } => self.load_ascii_map(&level), PrefabMode::Sectional { section } => self.apply_sectional(§ion), PrefabMode::RoomVaults => self.apply_room_vaults(), @@ -283,7 +282,7 @@ impl PrefabBuilder { let prev_builder = self.previous_builder.as_mut().unwrap(); prev_builder.build_map(); self.starting_position = prev_builder.get_starting_position(); - self.map = prev_builder.get_map().clone(); + self.map = prev_builder.get_map(); self.history = prev_builder.get_snapshot_history(); for e in prev_builder.get_spawn_list().iter() { let idx = e.0; diff --git a/src/map_builders/simple_map.rs b/src/map_builders/simple_map.rs index ff76d05..215328e 100644 --- a/src/map_builders/simple_map.rs +++ b/src/map_builders/simple_map.rs @@ -1,5 +1,4 @@ use rltk::RandomNumberGenerator; -use specs::prelude::*; use super::{apply_horizontal_tunnel, apply_room_to_map, apply_vertical_tunnel, MapBuilder}; use crate::{spawner, Map, Position, Rect, TileType, SHOW_MAPGEN_VISUALIZER}; diff --git a/src/map_builders/voronoi.rs b/src/map_builders/voronoi.rs index f1ec680..aa1f9f5 100644 --- a/src/map_builders/voronoi.rs +++ b/src/map_builders/voronoi.rs @@ -1,7 +1,6 @@ use std::collections::HashMap; use rltk::RandomNumberGenerator; -use specs::prelude::*; use super::common::{ generate_voronoi_spawn_regions, remove_unreachable_areas_returning_most_distant, diff --git a/src/map_builders/waveform_collapse.rs b/src/map_builders/waveform_collapse.rs index 6cb8d6a..f25ea23 100644 --- a/src/map_builders/waveform_collapse.rs +++ b/src/map_builders/waveform_collapse.rs @@ -8,7 +8,6 @@ use common::*; use constraints::*; use rltk::RandomNumberGenerator; use solver::*; -use specs::prelude::*; use super::common::{ generate_voronoi_spawn_regions, remove_unreachable_areas_returning_most_distant, diff --git a/src/spawner.rs b/src/spawner.rs index fa40a0e..fbf5661 100644 --- a/src/spawner.rs +++ b/src/spawner.rs @@ -85,7 +85,7 @@ pub fn spawn_room( } pub fn spawn_region( - map: &Map, + _map: &Map, rng: &mut RandomNumberGenerator, area: &[usize], map_depth: i32,