Mirrored_Repos/veloren
1
0
Fork 0
mirror of https://gitlab.com/veloren/veloren.git synced 2024-08-30 18:12:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'zesterer/civsim' into 'master'

Browse Source 
fmt

See merge request veloren/veloren!939
This commit is contained in:
Joshua Barretto 2020-04-23 21:10:00 +00:00
commit 1831c0e20c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
world/src/sim/map.rs
View File

@ -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((

4
world/src/site/settlement/mod.rs
View File

@ -147,9 +147,7 @@ impl Settlement {
this
}
pub fn get_origin(&self) -> Vec2<i32> {
self.origin
}
pub fn get_origin(&self) -> Vec2<i32> { self.origin }
/// Designate hazardous terrain based on world data
pub fn designate_from_world(&mut self, sim: &WorldSim, rng: &mut impl Rng) {