diff --git a/Cargo.lock b/Cargo.lock index 6a0317f..f435802 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2675,9 +2675,9 @@ checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" [[package]] name = "hexlab" -version = "0.5.0" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f19ccfce524b2ad659c08508de50522933909ed9787e4c4001cf80d4d380e789" +checksum = "7bd7c21f4e2c11d40473d1ae673905f4deae3b12104fa6d70eeef9ef385aceb6" dependencies = [ "bevy_reflect", "bevy_utils", diff --git a/src/maze/components.rs b/src/maze/components.rs index 6dbb5d1..3aa83f8 100644 --- a/src/maze/components.rs +++ b/src/maze/components.rs @@ -2,7 +2,7 @@ use crate::floor::components::Floor; use super::GlobalMazeConfig; use bevy::prelude::*; -use hexlab::HexMaze; +use hexlab::Maze as HexMaze; use hexx::{Hex, HexLayout, HexOrientation}; use rand::{rngs::StdRng, thread_rng, Rng, SeedableRng}; diff --git a/src/maze/triggers/common.rs b/src/maze/triggers/common.rs index c39b539..67e2aa7 100644 --- a/src/maze/triggers/common.rs +++ b/src/maze/triggers/common.rs @@ -2,7 +2,7 @@ use crate::maze::{ components::MazeConfig, errors::{MazeError, MazeResult}, }; -use hexlab::{GeneratorType, HexMaze, MazeBuilder}; +use hexlab::prelude::{Maze as HexMaze, *}; pub fn generate_maze(config: &MazeConfig) -> MazeResult { MazeBuilder::new() diff --git a/src/maze/triggers/spawn.rs b/src/maze/triggers/spawn.rs index 93e2725..bb0cbc3 100644 --- a/src/maze/triggers/spawn.rs +++ b/src/maze/triggers/spawn.rs @@ -10,7 +10,7 @@ use crate::{ theme::palette::rose_pine::RosePine, }; use bevy::prelude::*; -use hexlab::prelude::*; +use hexlab::prelude::{Maze as HexMaze, Tile as HexTile, *}; use hexx::HexOrientation; use std::f32::consts::{FRAC_PI_2, FRAC_PI_3, FRAC_PI_6}; diff --git a/src/player/systems/input.rs b/src/player/systems/input.rs index f536e76..3482a3a 100644 --- a/src/player/systems/input.rs +++ b/src/player/systems/input.rs @@ -4,6 +4,7 @@ use crate::{ player::components::{CurrentPosition, MovementTarget, Player}, }; use bevy::prelude::*; +use hexlab::WallStorage; use hexx::{EdgeDirection, HexOrientation}; pub(super) fn player_input( @@ -24,7 +25,7 @@ pub(super) fn player_input( continue; }; - let Some(tile) = maze.0.get_tile(current_pos) else { + let Some(tile) = maze.0.get(current_pos) else { continue; };