diff options
| author | Luis Ferro <luis.ferro@eggplant.io> | 2019-11-12 09:44:34 +0100 |
|---|---|---|
| committer | Luis Ferro <luis.ferro@eggplant.io> | 2019-11-12 09:44:34 +0100 |
| commit | 5216caa5e64b8be05ff859ba85f90f7a8fa1e6c1 (patch) | |
| tree | 9735bd620d04ee24668c3e933ff9436f55658b82 /src/world.rs | |
| parent | 0db41de73fb65bdbe2e412f79704cff1874c7312 (diff) | |
Fix diff and remove default macro
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 {
|