From 0db41de73fb65bdbe2e412f79704cff1874c7312 Mon Sep 17 00:00:00 2001
From: Luis Ferro <luis.ferro@eggplant.io>
Date: Mon, 11 Nov 2019 20:02:55 +0100
Subject: Add char generation and positioning in first room of the dungeon

---
 src/world.rs | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'src/world.rs')

diff --git a/src/world.rs b/src/world.rs
index 69f3897..d55a9e5 100644
--- a/src/world.rs
+++ b/src/world.rs
@@ -1,6 +1,6 @@
 use rand::Rng;
 
-type Point = (usize, usize);
+pub type Point = (usize, usize);
 
 #[derive(Clone)]
 pub enum TileType {
@@ -193,7 +193,13 @@ pub trait GameWorld {
 
     fn generate(&mut self);
 
+<<<<<<< Updated upstream
     fn to_tilegrid(&self) -> Result<TileGrid, String>;
+=======
+    fn to_tilegrid(&self) -> TileGrid;
+
+    fn get_start_location(&self) -> Point;
+>>>>>>> Stashed changes
 }
 
 fn hor_dist(point1: Point, point2: Point) -> f32 {
@@ -331,6 +337,13 @@ impl GameWorld for World {
 
         Ok(grid)
     }
+
+    fn get_start_location(&self) -> Point {
+        if self.rooms.len() > 0 {
+            return self.rooms[0].center;
+        }
+        return (0,0)
+    }
 }
 
 #[cfg(test)]
-- 
cgit v1.2.3