Merge remote-tracking branch 'upstream/master'

1 files changed, 2 insertions, 35 deletions

diff --git a/src/world.rs b/src/world.rs
index bf8b498..15c77e4 100644
--- a/src/world.rs
+++ b/src/world.rs
@@ -1,7 +1,7 @@
 use rand::Rng;

 use pancurses::{Window};

 use crate::entities::{Entity};

-use crate::tiling::{TileGrid, Tileable, TileType};

+use crate::tiling::{TileGrid, Tileable, TileType, draw_block};

 

 pub type Point = (usize, usize);

 

@@ -187,39 +187,6 @@ impl Dungeon {
             levels: vec![]

         }

     }

-

-    pub fn debug_levels(&self) {

-        for l in &self.levels {

-            Dungeon::debug_level(l);

-        }

-    }

-

-    fn draw_block(window: &Window, block: &TileType) {

-        window.printw(Dungeon::tile_to_str(block));

-    }

-

-    fn debug_level(level: &Level) {

-        let grid = level.to_tilegrid().unwrap();

-

-        for line in grid.raw_data().iter() {

-            for block in line.iter() {

-                print!("{}", Dungeon::tile_to_str(block));

-            }

-            print!("\n");

-        }

-    }

-

-    fn tile_to_str(tile: &TileType) -> &str {

-        match tile {

-            TileType::Floor => ".",

-            TileType::Wall => "#",

-            TileType::Empty => " ",

-            TileType::StairsDown => ">",

-            TileType::StairsUp => "<",

-            TileType::Player => "@",

-            _ => "?"

-        }

-    }

 }

 

 impl Generatable for Dungeon {

@@ -286,7 +253,7 @@ impl Level {
 

         for (linenum, line) in grid.raw_data().iter().enumerate() {

             for block in line.iter() {

-                Dungeon::draw_block(&window, &block);

+                draw_block(&window, &block);

             }

             window.mv(linenum as i32, 0);

         }