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

Fixed caves again

Browse Source
This commit is contained in:
Joshua Barretto 2019-06-05 21:33:06 +01:00
parent 5cc4669bce
commit 9ddc569a75
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
world/src/sim.rs
View File

@ -305,7 +305,7 @@ impl<'a> Sampler<'a> {
let water = Block::new(1, Rgb::new(100, 150, 255));
let warm_stone = Block::new(1, Rgb::new(165, 165, 90));
let ground_block = if (wposf.z as f32) < height - 4.0 {
let block = if (wposf.z as f32) < height - 4.0 {
// Underground
Some(stone)
} else if (wposf.z as f32) < height {
@ -319,7 +319,7 @@ impl<'a> Sampler<'a> {
};
// Caves
let block = ground_block.or_else(|| {
let block = block.and_then(|block| {
// Underground
let cave = cave_xy.powf(2.0)
* (wposf.z as f32 - cave_alt)
@ -332,7 +332,7 @@ impl<'a> Sampler<'a> {
if cave {
None
} else {
ground_block
Some(block)
}
});