diff options
Diffstat (limited to 'src/world.rs')
| -rw-r--r-- | src/world.rs | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/world.rs b/src/world.rs index d55a9e5..05b82ed 100644 --- a/src/world.rs +++ b/src/world.rs @@ -193,13 +193,9 @@ 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 {
|