diff options
| -rw-r--r-- | dungeon/src/map.rs | 4 | ||||
| -rw-r--r-- | dungeon/src/pos.rs | 6 | ||||
| -rw-r--r-- | graphics/src/lib.rs | 4 |
3 files changed, 11 insertions, 3 deletions
diff --git a/dungeon/src/map.rs b/dungeon/src/map.rs index b6f3356..cb602e8 100644 --- a/dungeon/src/map.rs +++ b/dungeon/src/map.rs @@ -190,8 +190,8 @@ impl Floor { impl Default for Floor { /// Returns a floor with a single set of walls on the map border fn default() -> Self { + const PLAYER_START: Pos = Pos::new_const::<1, 1>(); let mut tiles = Box::new([Tile::Air; TILE_COUNT]); - let player_start = Pos::new_const::<1, 1>(); let seed = 0u64; for pos in Pos::values() { @@ -202,7 +202,7 @@ impl Default for Floor { Self { tiles, - player_start, + player_start: PLAYER_START, seed, } } diff --git a/dungeon/src/pos.rs b/dungeon/src/pos.rs index 143b0f0..e953ea4 100644 --- a/dungeon/src/pos.rs +++ b/dungeon/src/pos.rs @@ -150,3 +150,9 @@ impl Pos { (0..MAP_SIZE).flat_map(|y| (0..MAP_SIZE).filter_map(move |x| Self::new(x, y))) } } +impl Default for Pos { + fn default() -> Self { + const DEFAULT: Pos = Pos::new_const::<0, 0>(); + DEFAULT + } +} diff --git a/graphics/src/lib.rs b/graphics/src/lib.rs index c0b0019..bba46c2 100644 --- a/graphics/src/lib.rs +++ b/graphics/src/lib.rs @@ -26,6 +26,8 @@ impl Window { /// Draws a frame provided with the game state `Dungeon` pub fn draw(&mut self, _dungeon: &Dungeon) { - let _draw = self.handle.begin_drawing(&self.thread); + let mut draw = self.handle.begin_drawing(&self.thread); + + draw.draw_text("test", 10, 10, 20, Color::GREEN); } } |