From 380092080bef767fd16ee8769382ffe3304fe148 Mon Sep 17 00:00:00 2001 From: Joshua Barretto Date: Thu, 23 Apr 2020 22:10:05 +0100 Subject: [PATCH] fmt --- world/src/sim/map.rs | 8 +++++--- world/src/site/settlement/mod.rs | 4 +--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/world/src/sim/map.rs b/world/src/sim/map.rs index 8ef77be281..aecea6880c 100644 --- a/world/src/sim/map.rs +++ b/world/src/sim/map.rs @@ -169,9 +169,11 @@ impl MapConfig { sample.downhill, sample.river.river_kind, sample.path.is_path(), - sample.sites - .iter() - .any(|site| site.get_origin().distance_squared(pos * TerrainChunkSize::RECT_SIZE.x as i32) < 64i32.pow(2)), + sample.sites.iter().any(|site| { + site.get_origin() + .distance_squared(pos * TerrainChunkSize::RECT_SIZE.x as i32) + < 64i32.pow(2) + }), ) }) .unwrap_or(( diff --git a/world/src/site/settlement/mod.rs b/world/src/site/settlement/mod.rs index 9fb4081102..cba520fa10 100644 --- a/world/src/site/settlement/mod.rs +++ b/world/src/site/settlement/mod.rs @@ -147,9 +147,7 @@ impl Settlement { this } - pub fn get_origin(&self) -> Vec2 { - self.origin - } + pub fn get_origin(&self) -> Vec2 { self.origin } /// Designate hazardous terrain based on world data pub fn designate_from_world(&mut self, sim: &WorldSim, rng: &mut impl Rng) {