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

combine into one filter_map

Browse Source
This commit is contained in:
Isse 2023-05-03 16:21:12 +02:00
parent 922ba9ed5c
commit 44bf8f19f1
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
voxygen/src/hud/subtitles.rs
View File

@ -289,15 +289,14 @@ impl<'a> Widget for Subtitles<'a> {
subtitles
.subtitles
.iter()
.filter_map(|(localization, data)| Some((localization, data.last()?)))
.filter(|(_, data)| {
data.position.map_or(true, |pos| {
pos.distance_squared(listener_pos)
< MAX_SUBTITLE_DIST * MAX_SUBTITLE_DIST
})
})
.map(|(localization, data)| {
(self.localized_strings.get_msg(localization), data)
.filter_map(|(localization, data)| {
let data = data.last()?;
data.position
.map_or(true, |pos| {
pos.distance_squared(listener_pos)
< MAX_SUBTITLE_DIST * MAX_SUBTITLE_DIST
})
.then(|| (self.localized_strings.get_msg(localization), data))
}),
);