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 'fa/hotfix-ci-failure' into 'master'

Browse Source 
Fix rustc warning

See merge request veloren/veloren!314
This commit is contained in:
Imbris 2019-07-07 04:37:22 +00:00
commit 9b99666953
1 changed files with 8 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
voxygen/src/session.rs
View File

@ -176,22 +176,14 @@ impl PlayState for SessionState {
let cam_dir =
(self.scene.camera().get_focus_pos() - cam_pos).normalized();
let (d, block) = {
let terrain = client.state().terrain();
let ray =
terrain.ray(cam_pos, cam_pos + cam_dir * 100.0).cast();
(
ray.0,
if let Ok(Some(b)) = ray.1 {
Some(*b)
} else {
None
},
)
};
if let Some(block) = block {
self.selected_block = block;
if let Ok(Some(block)) = client
.state()
.terrain()
.ray(cam_pos, cam_pos + cam_dir * 100.0)
.cast()
.1
{
self.selected_block = *block;
}
}
} else {